Fix a few key bugs regarding stage building on Linux and service ordering.

(Portage version: 2.1.2_rc1-r3)

2 files changed, 74 insertions, 0 deletions

diff --git a/sys-apps/baselayout/files/baselayout-1.13.0_alpha5-2364.patch b/sys-apps/baselayout/files/baselayout-1.13.0_alpha5-2364.patch
new file mode 100644
index 000000000000..84ecf7d52e24
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-1.13.0_alpha5-2364.patch
@@ -0,0 +1,71 @@
+Index: Makefile
+===================================================================
+--- Makefile	(revision 2359)
++++ Makefile	(working copy)
+@@ -23,7 +23,7 @@
+ 	/var/lock /var/run
+ 
+ ifeq ($(OS),Linux)
+-	KEEP_DIRS += /dev /proc /sys
++	KEEP_DIRS += /dev /sys
+ 	NET_LO = net.lo
+ endif
+ ifneq ($(OS),Linux)
+Index: ChangeLog
+===================================================================
+--- ChangeLog	(revision 2359)
++++ ChangeLog	(working copy)
+@@ -1,6 +1,11 @@
+ # ChangeLog for Gentoo System Intialization ("rc") scripts
+ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
+ 
++  05 Nov 2006; Roy Marples <uberlord@gentoo.org>:
++
++    Don't create /proc on Linux as build scripts like to handle it now.
++    Fixes #154126.
++
+ * baselayout-1.13.0_alpha5 (02 Nov 2006)
+ 
+   02 Nov 2006; Roy Marples <uberlord@gentoo.org>:
+Index: sbin/rc
+===================================================================
+--- sbin/rc	(revision 2359)
++++ sbin/rc	(working copy)
+@@ -267,7 +267,7 @@
+ 
+ 	for x in $(dolisting "${svcdir}/inactive/") \
+ 	         $(dolisting "${svcdir}/started/") ; do
+-		list="${list} ${x##*/}"
++		list="${x##*/} ${list}"
+ 	done
+ 
+ 	[[ -n ${list} ]] && reverse_list $(rc-depend -ineed -iuse -iafter ${list})
+@@ -442,7 +442,7 @@
+ rm -rf "${svcdir}/failed" &>/dev/null
+ 
+ # If $svcdir is mounted in ram, save it back to disk and unmount
+-if [[ $'\n'$(get_mounts) =~ $'\n'"${svcdir} " ]] ; then
++if [[ $'\n'$(get_mounts) =~ $'\n'${svcdir}\  ]] ; then
+ 	# Function to show the timeout message
+ 	timeout=
+ 	do_timeout() {
+Index: sbin/depscan.sh
+===================================================================
+--- sbin/depscan.sh	(revision 2359)
++++ sbin/depscan.sh	(working copy)
+@@ -149,6 +149,7 @@
+ 	if [[ ${retval} == "0" ]] ; then
+ 		DEPTREE="deptree"
+ 		export DEPTREE
++		cd /etc/init.d
+ 		bash "${mysvcdir}/depcache" | \
+ 			awk \
+ 				-f /lib/rcscripts/awk/functions.awk \
+@@ -187,6 +188,7 @@
+ 	if [[ ${retval} == "0" ]] ; then
+ 		DEPTREE="netdeptree"
+ 		export DEPTREE
++		cd "${svclib}/net"
+ 		bash "${mysvcdir}/netdepcache" | \
+ 			awk \
+ 				-f /lib/rcscripts/awk/functions.awk \
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5-r1 b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5-r1
new file mode 100644
index 000000000000..1cb36c05fbb1
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.13.0_alpha5-r1
@@ -0,0 +1,3 @@
+MD5 2e6ef285409b00b435121f9326eab2d1 baselayout-1.13.0_alpha5.tar.bz2 255507
+RMD160 bd0d391abd8cee745dfdce502d3ca78bdb7013f3 baselayout-1.13.0_alpha5.tar.bz2 255507
+SHA256 987e378072608480f956ff32a6c5851e98ac7c2c6653d18148bd66681592a23e baselayout-1.13.0_alpha5.tar.bz2 255507