diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-08-10 10:38:47 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-08-10 10:38:47 +0200 |
| commit | d170e60e23e8956d3dcda3c10b9c26147cdd1a51 (patch) | |
| tree | 66cd00a24cf008f2f5d1eaf9408d41f23dba332f /main/alpine-conf | |
| parent | 5e12d5a2868a6bf4c003caadb20783f2227b4707 (diff) | |
| download | aports-d170e60e23e8956d3dcda3c10b9c26147cdd1a51.tar.bz2 aports-d170e60e23e8956d3dcda3c10b9c26147cdd1a51.tar.xz | |
main/alpine-conf: fix setup-timezone -z
ref #4518
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-timezone-fix-use-of-z-option.patch | 55 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 |
2 files changed, 63 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-setup-timezone-fix-use-of-z-option.patch b/main/alpine-conf/0001-setup-timezone-fix-use-of-z-option.patch new file mode 100644 index 0000000000..14b4fcdab1 --- /dev/null +++ b/main/alpine-conf/0001-setup-timezone-fix-use-of-z-option.patch @@ -0,0 +1,55 @@ +From 21a2a17a6365f1d0c6ab2ba5826896e9b1491e99 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 10 Aug 2015 10:37:05 +0200 +Subject: [PATCH] setup-timezone: fix use of -z option + +ref #4518 +--- + setup-timezone.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/setup-timezone.in b/setup-timezone.in +index 6964f69..514f9ca 100644 +--- a/setup-timezone.in ++++ b/setup-timezone.in +@@ -8,7 +8,7 @@ zroot=/usr/share/zoneinfo + + usage() { + cat <<__EOF__ +-usage: setup-timezone [-h] [-k|-i] [-z subdir of $zroot] ++usage: setup-timezone [-h] [-k|-i] [-z TIMEZONE] + + Sets the timezone for the system. + +@@ -16,7 +16,7 @@ options: + -h Show this help + -i Install tzdata and symlink instead of making a copy + -k Keep previous copies of tzdata +- -z Specify the timezone as a subdirectory of $zroot ++ -z Set given timezone. (relative $zroot) + __EOF__ + exit 1 + } +@@ -64,7 +64,7 @@ while getopts "hikz:" opt; do + h) usage;; + i) INSTALL_TZDATA=true;; + k) KEEP_TZDATA=true;; +- z) ZONEINFODIR="$OPTARG";; ++ z) ZONE="$OPTARG";; + esac + done + +@@ -87,8 +87,8 @@ fi + + + while true; do +- if [ -n "$ZONEINFODIR" ]; then +- setup_tz "$ZONEINFODIR" ++ if [ -n "$ZONE" ]; then ++ setup_tz "$zroot"/"$ZONE" + break + fi + +-- +2.5.0 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 4eccf55172..8641e03289 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.2.1 -pkgrel=5 +pkgrel=6 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -12,6 +12,7 @@ source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.x 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch 0001-setup-disk-fix-btrfs-root.patch 0001-setup-bootable-warn-and-fix-kernel-name-change.patch + 0001-setup-timezone-fix-use-of-z-option.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -42,14 +43,17 @@ md5sums="d8863487539eb41de219303addf71aa1 alpine-conf-3.2.1.tar.xz f1439adcfc377c56b987b379b725f0af 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch f2da5b6cf6e4f1c1d24b59210b172bd8 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch bb1acd69593e19a9ab686cf6b790bbdb 0001-setup-disk-fix-btrfs-root.patch -f73ccf7115d83a7230fd124c507e3c5c 0001-setup-bootable-warn-and-fix-kernel-name-change.patch" +f73ccf7115d83a7230fd124c507e3c5c 0001-setup-bootable-warn-and-fix-kernel-name-change.patch +8a67f0ac0826102dc9dceab34c6e036e 0001-setup-timezone-fix-use-of-z-option.patch" sha256sums="f0e7954bb1a5144f551694acfde818bbad4e42a575e7a8e3a06a777ade7a5d9d alpine-conf-3.2.1.tar.xz e30d5fc4c1ae6af9673c543427561d027792c1bb26e3901ce954d15689dc66e9 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch 6e532930bc263d004975fe1feac115f17452e9f80b5efb22f538e7ebcbb6636d 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch 1ec287f5ec4ca94af1b02067eb3a785e527a7658ed737b28e5f39c437db66625 0001-setup-disk-fix-btrfs-root.patch -8fdde27235e14dc1f0f8ed7edb1f086b792f6be060e329e8c2c59d9064b1ee3f 0001-setup-bootable-warn-and-fix-kernel-name-change.patch" +8fdde27235e14dc1f0f8ed7edb1f086b792f6be060e329e8c2c59d9064b1ee3f 0001-setup-bootable-warn-and-fix-kernel-name-change.patch +c917e5e1e4f7cf7cb5a0cd9922d7e92654d761fb301977c02866a03f374fd184 0001-setup-timezone-fix-use-of-z-option.patch" sha512sums="20c11b134234708d86fe4cc093c4073df3496a43d13994d0df369066afed39a9a3c97cebacdbb6518f212e414c9456c31ee41bd600b3fc29e892448118a7b5e8 alpine-conf-3.2.1.tar.xz 135bd0a0638f14a90d896c31de09eb3aa08cd7b2b1452fa20fdf12d128282c5c9eee5c1d76f7d8b62714f15395f225bf61c9968ad04ff164e64e8924c89abbd6 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch cd2c1f3adef443edf4473719f1cf4f277336fb59527ba70ed30f1f2c87d3cc63afe55a009b5bb5666ff79784ea8a79730dfb67a37d8e3fd8fe8fd7eb88a564fc 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch 0d7e6ce26798ab42bf1e2cbda6421e811e949d427e1ff69210abd950686f5ff0a5d61404db9de160268ae976e768aba74f51814b8a9b6e318c32563f924a3965 0001-setup-disk-fix-btrfs-root.patch -df9c2cec67054390d8e8c81b797cfbf0f1b142faabe389f2adf99094b15642285ad683a875728cfff0f13ebb91b3d16eb1ded2ee889b0f9d29a6d05a2a584b83 0001-setup-bootable-warn-and-fix-kernel-name-change.patch" +df9c2cec67054390d8e8c81b797cfbf0f1b142faabe389f2adf99094b15642285ad683a875728cfff0f13ebb91b3d16eb1ded2ee889b0f9d29a6d05a2a584b83 0001-setup-bootable-warn-and-fix-kernel-name-change.patch +13062f853d30126d77c5201516d978bf30e154a8efd66b0869c7732550694a49e7ad45d29014242cb51a3917c8e7da6af99e51319792a2e89cb8ff9dd69ea08e 0001-setup-timezone-fix-use-of-z-option.patch" |