From: Mike Westerhof <mwester@dls.net>
Date: Tue, 3 Feb 2009 06:34:23 +0000 (-0600)
Subject: SlugOS: initscripts-slugos - fix cleanup step; no more checkroot.sh to remove.
X-Git-Tag: Release-2010-05/1~3992
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=055f690e4d27dc3e1fad464eddac0ed704b56323;p=openembedded.git

SlugOS: initscripts-slugos - fix cleanup step; no more checkroot.sh to remove.
---

diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb
index ba1b97e024..f8947fbe8d 100644
--- a/packages/initscripts/initscripts-slugos_1.0.bb
+++ b/packages/initscripts/initscripts-slugos_1.0.bb
@@ -16,7 +16,7 @@ RDEPENDS = ""
 # All other standard definitions inherited from initscripts
 # Except the PR which is hacked here.  The format used is
 # a suffix
-PR := "${PR}.17"
+PR := "${PR}.18"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
@@ -26,7 +26,6 @@ SRC_URI += "file://alignment.sh"
 SRC_URI += "file://domainname.sh"
 SRC_URI += "file://devices.patch;patch=1"
 SRC_URI += "file://bootclean.sh"
-SRC_URI += "file://checkroot"
 
 # Without this it is not possible to patch checkroot
 S = "${WORKDIR}"
@@ -35,14 +34,6 @@ do_install_append() {
 	# the image build command now installs this for slugos
 	rm	${D}${sysconfdir}/device_table
 
-	# Ugly - we need to get rid of the checkroot.sh
-	# that was installed by initscript-1.0.bb; the new
-	# rcS script will "source" files that end in .sh,
-	# and that messes up our checkroot.sh script (due
-	# to redirection issues.  We need to use only our
-	# checkroot, without the ".sh" suffix.
-	rm -f ${D}${sysconfdir}/init.d/checkroot.sh
-
 	# slugos specific scripts
 	install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/domainname.sh ${D}${sysconfdir}/init.d