update changelog

When we use the --utc or --localtime switch, also use --noadjfile if it
is available. This means hwclock will not use a drift file.

X-Gentoo-Bug: 584722
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=584722

ChangeLog

@@ -1,3 +1,66 @@
+commit 6074cbd651da7f27fc6fbc20a66f651c2577857b
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    hwclock: always use --noadjfile if available
+    
+    When we use the --utc or --localtime switch, also use --noadjfile if it
+    is available. This means hwclock will not use a drift file.
+    
+    X-Gentoo-Bug: 584722
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=584722
+
+commit 8b9ea8b9e6631d5cd987a7cb31560aa5a13c060b
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.21.2
+
+commit c47b497483040107263c9b9984474db5c569485b
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update changelog
+
+commit 977811563dd93cab7a64caefa0e86f5b864fc04f
+Author: Benda Xu <heroxbd@gentoo.org>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Fix PATH for Prefix.
+    
+    1. remove default /bin:/sbin:/usr/bin:/usr/sbin
+    2. PKG_PREFIX should be defaulted to $(PREFIX)/usr
+    3. LOCAL_PREFIX should be defaulted to $(PREFIX)/usr/local
+    
+    X-Gentoo-Bug:583634
+    X-Gentoo-Bug-URL:https://bugs.gentoo.org/show_bug.cgi?id=583634
+
+commit 47aa0b93cdf14253c3a75b4feefabe97c43cbf8a
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    fstabinfo/mountinfo: ensure /etc/fstab exists before calling setmntent
+    
+    This is based on a patch by A. Wilcox <awilfox.gentoo@foxkit.us>.
+    
+    X-Gentoo-Bug: 478226
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=478226
+    
+    X-Gentoo-Bug: 478226
+    X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=478226
+
+commit f680c89c26709164934ee72534af7a3960166cf3
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.21.1
+
+commit 5bfb7d6c77ff533e34e2bbfe5b6e57410d961d70
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Update ChangeLog
+
 commit 12c8248b5f53879935d4e62ef42023f703c7b636
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
@@ -1025,63 +1088,3 @@ Commit: Doug Freed <dwfreed@mtu.edu>
     
     The cache is created in $RC_LIBEXECDIR, not $RC_SVCDIR, so fix the error
     message when we fail to create it to match.
-
-commit a36a635b016a7427dd1739a26c951fedf22f0dec
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    tmpfiles: Recognize type 'v' (create btrfs subvol)
-    
-    This change does NOT implement btrfs subvol creation.  Instead, it
-    treats 'v' the same as 'd', which is an acceptable fallback
-    according to the manual.
-    
-    Fixes #58
-
-commit 9310ccc06bcadd8897aed51cd51c94fccb7d9c07
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: Doug Freed <dwfreed@mtu.edu>
-
-    Remove execute bit from tmpfiles.sh.in
-
-commit 0c2e4eb3cd7935d375b74099a3a9a5fe519e6cab
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Update ChangeLog
-
-commit d2ce07e227ec95370e8aee5f1199edc6ad61aff9
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    Add rc-sstat script
-    
-    The rc-sstat script is written to display status of s6 services and
-    run rc-status to display all services status.
-    
-    This currently only works on Linux.
-
-commit b209fe3859c05c286037843bb34058f849c54b15
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    bootmisc: Don't call dmesg in systemd-nspawn containers
-    
-    This fixes #57.
-
-commit c94c8288cd5217b01c24d6f048c64ebbc30bee02
-Author: Mike Frysinger <vapier@gentoo.org>
-Commit: Mike Frysinger <vapier@gentoo.org>
-
-    fix link to s6 website
-
-commit bcb9c44e73ccf332c7c961a6f82520699c6e776d
-Author: Mike Gilbert <floppym@gentoo.org>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    man: Document the stopsig variable
-    
-    This variable can be used to set the signal to send if the service is
-    using start-stop-daemon.
-    
-    This fixes #56

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.21
+VERSION=	0.21.2
 PKG=		${NAME}-${VERSION}

init.d/hwclock.in

@@ -69,6 +69,16 @@ _hwclock()
 	return 1
 }
 
+get_noadjfile()
+{
+	if ! yesno $clock_adjfile; then
+		# Some implementations don't handle adjustments
+		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
+			echo --noadjfile
+		fi
+	fi
+}
+
 start()
 {
 	local retval=0 errstr=""
@@ -91,16 +101,16 @@ start()
 	fi
 
 	# Always set the kernel's time zone.
-	_hwclock --systz $utc_cmd $clock_args
+	_hwclock --systz $utc_cmd $(get_noadjfile) $clock_args
 	: $(( retval += $? ))
 
 	if [ -e /etc/adjtime ] && yesno $clock_adjfile; then
-		_hwclock --adjust $utc_cmd
+		_hwclock --adjust $utc_cmd $(get_noadjfile)
 		: $(( retval += $? ))
 	fi
 
 	if yesno ${clock_hctosys:-YES}; then
-		_hwclock --hctosys $utc_cmd $clock_args
+		_hwclock --hctosys $utc_cmd $(get_noadjfile) $clock_args
 		: $(( retval += $? ))
 	fi
 
@@ -122,14 +132,7 @@ stop()
 
 	ebegin "Setting hardware clock using the system clock" "[$utc]"
 
-	if ! yesno $clock_adjfile; then
-		# Some implementations don't handle adjustments
-		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
-			utc_cmd="$utc_cmd --noadjfile"
-		fi
-	fi
-
-	_hwclock --systohc $utc_cmd $clock_args
+	_hwclock --systohc $utc_cmd $(get_noadjfile) $clock_args
 	retval=$?
 
 	eend $retval "Failed to sync clocks"
@@ -144,5 +147,5 @@ save()
 show()
 {
 	setupopts
-	hwclock --show "$utc_cmd" $clock_args
+	hwclock --show "$utc_cmd" $(get_noadjfile) $clock_args
 }

mk/os-prefix.mk

@@ -3,4 +3,6 @@
 
 ifeq (${MKPREFIX},yes)
 CPPFLAGS+=	-DPREFIX
+PKG_PREFIX?=	$(PREFIX)/usr
+SED_EXTRA=	-e '/_PATH=.*usr.bin/d'
 endif

mk/os.mk

@@ -13,7 +13,7 @@
 _OS_SH=		uname -s | tr '/' '-'
 _OS:= 		$(shell ${_OS_SH})
 OS?= 		${_OS}
-include ${MK}/os-${OS}.mk
 include ${MK}/os-prefix.mk
+include ${MK}/os-${OS}.mk
 
 RC_LIB=		/$(LIBNAME)/rc

mk/sys.mk

@@ -26,7 +26,7 @@ ifeq (${MKPREFIX},yes)
 UPREFIX= ${PREFIX}/usr
 endif
 endif
-LOCAL_PREFIX=		/usr/local
+LOCAL_PREFIX=		$(UPREFIX)/local
 
 PICFLAG?=		-fPIC
 

src/rc/fstabinfo.c

@@ -178,6 +178,9 @@ int main(int argc, char **argv)
 	FILE *fp;
 #endif
 
+	/* fail if there is no /etc/fstab */
+	if (!exists("/etc/fstab"))
+		eerrorx("/etc/fstab does not exist");
 	/* Ensure that we are only quiet when explicitly told to be */
 	unsetenv("EINFO_QUIET");
 

src/rc/mountinfo.c

@@ -297,6 +297,9 @@ getmntfile(const char *file)
 	struct mntent *ent = NULL;
 	FILE *fp;
 
+	if (!exists("/etc/fstab"))
+		return NULL;
+
 	fp = setmntent("/etc/fstab", "r");
 	while ((ent = getmntent(fp)))
 		if (strcmp(file, ent->mnt_dir) == 0)