Date: Sunday, September 9, 2012 @ 14:23:24
Author: dreisner
Revision: 166530
upgpkg: initscripts 2012.08.3-3
- fix hwclock for util-linux 2.22 (FS#31416)
Added:
initscripts/trunk/split-hwclock-calls.diff
Modified:
initscripts/trunk/PKGBUILD
--------------------------+
PKGBUILD | 14 +++++++++++---
split-hwclock-calls.diff | 21 +++++++++++++++++++++
2 files changed, 32 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-09-09 15:58:07 UTC (rev 166529)
+++ PKGBUILD 2012-09-09 18:23:24 UTC (rev 166530)
@@ -5,7 +5,7 @@
pkgname=initscripts
pkgver=2012.08.3
-pkgrel=2
+pkgrel=3
pkgdesc="System initialization/bootup scripts"
arch=('any')
url="http://www.archlinux.org";
@@ -22,14 +22,22 @@
'wireless_tools: Legacy wireless networking')
makedepends=(asciidoc)
install=initscripts.install
-source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz";)
+source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz";
+ 'split-hwclock-calls.diff')
+md5sums=('b5e8de40bf798637cb1634a1555d0f1f'
+ 'd381ed1fbdc3780496317844241b0568')
package() {
cd ${srcdir}/${pkgname}-${pkgver}
+
+ #
http://mailman.archlinux.org/pipermail/arch-projects/2012-September/003252.html
+ # patch based on master does not apply, so this is the exact patch posted to
+ # the bug report it fixes (FS#31416).
+ patch -Np1 <"$srcdir/split-hwclock-calls.diff"
+
make DESTDIR=${pkgdir} install
# moved to filesystem
rm -rf ${pkgdir}/etc/profile.d
rm ${pkgdir}/usr/share/man/man7/archlinux.7
}
-md5sums=('b5e8de40bf798637cb1634a1555d0f1f')
Added: split-hwclock-calls.diff
===================================================================
--- split-hwclock-calls.diff (rev 0)
+++ split-hwclock-calls.diff 2012-09-09 18:23:24 UTC (rev 166530)
@@ -0,0 +1,21 @@
+diff --git a/rc.sysinit b/rc.sysinit
+index eb49e2b..8f9727b 100755
+--- a/rc.sysinit
++++ b/rc.sysinit
+@@ -34,7 +34,6 @@ bootlogd -p /run/bootlogd.pid
+
+ run_hook sysinit_start
+
+-HWCLOCK_PARAMS="--systz"
+ case $HARDWARECLOCK in
+ "") ;;
+ UTC) HWCLOCK_PARAMS+=" --utc --noadjfile";;
+@@ -54,7 +53,7 @@ if [[ $HWCLOCK_PARAMS ]]; then
+
+ [[ $TIMEZONE ]] && export TZ=$TIMEZONE
+
+- hwclock $HWCLOCK_PARAMS && stat_done || stat_fail
++ { hwclock $HWCLOCK_PARAMS && hwclock --systz; } && stat_done ||
stat_fail
+
+ unset TZ
+ fi
