Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage

2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission

2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.

2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3

2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp.  Thanks to holger freyther for pointing it out.

BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A

1 files changed, 66 insertions, 66 deletions

diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 076a69576c..6728f628c8 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -52,91 +52,91 @@ do_install () {
 #
 # Create directories and install device independent scripts
 #
-	install -d ${D}/${sysconfdir}/init.d \
-		   ${D}/${sysconfdir}/rcS.d \
-		   ${D}/${sysconfdir}/rc0.d \
-		   ${D}/${sysconfdir}/rc1.d \
-		   ${D}/${sysconfdir}/rc2.d \
-		   ${D}/${sysconfdir}/rc3.d \
-		   ${D}/${sysconfdir}/rc4.d \
-		   ${D}/${sysconfdir}/rc5.d \
-		   ${D}/${sysconfdir}/rc6.d \
-		   ${D}/${sysconfdir}/default
+	install -d ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/rcS.d \
+		   ${D}${sysconfdir}/rc0.d \
+		   ${D}${sysconfdir}/rc1.d \
+		   ${D}${sysconfdir}/rc2.d \
+		   ${D}${sysconfdir}/rc3.d \
+		   ${D}${sysconfdir}/rc4.d \
+		   ${D}${sysconfdir}/rc5.d \
+		   ${D}${sysconfdir}/rc6.d \
+		   ${D}${sysconfdir}/default
 
-	install -m 0755    ${WORKDIR}/bootmisc.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/checkroot.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/finish		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/halt		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/hostname.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/mountall.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/mountnfs.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/ramdisk		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/reboot		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/rmnologin	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/sendsigs		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/single		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/umountnfs.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/urandom		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/devpts.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/devpts		${D}/${sysconfdir}/default
-	install -m 0755    ${WORKDIR}/sysfs.sh		${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/bootmisc.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/checkroot.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/finish		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/halt		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/hostname.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/mountall.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/mountnfs.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/ramdisk		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/reboot		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/rmnologin	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/sendsigs		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/single		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/umountnfs.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/urandom		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/devpts.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/devpts		${D}${sysconfdir}/default
+	install -m 0755    ${WORKDIR}/sysfs.sh		${D}${sysconfdir}/init.d
 	if [ "${TARGET_ARCH}" = "arm" ]; then
-		install -m 0755 ${WORKDIR}/alignment.sh	${D}/${sysconfdir}/init.d
+		install -m 0755 ${WORKDIR}/alignment.sh	${D}${sysconfdir}/init.d
 	fi
 #
 # Install device dependent scripts
 #
 
 	if [ "${DISTRO}" == "openzaurus" ]; then
-		cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}/${sysconfdir}/init.d/checkversion
-        	chmod 0755 				${D}/${sysconfdir}/init.d/checkversion
-		ln -sf          ../init.d/checkversion  ${D}/${sysconfdir}/rcS.d/S00version
+		cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}${sysconfdir}/init.d/checkversion
+        	chmod 0755 				${D}${sysconfdir}/init.d/checkversion
+		ln -sf          ../init.d/checkversion  ${D}${sysconfdir}/rcS.d/S00version
 	fi
 
 	if [ "${MACHINE}" == "c7x0" ]; then
-		install -m 0755    ${WORKDIR}/corgikeymap-2.6.map		${D}/${sysconfdir}
-		install -m 0755    ${WORKDIR}/keymap				${D}/${sysconfdir}/init.d
-		ln -sf          ../init.d/keymap  				${D}/${sysconfdir}/rcS.d/S04keymap
+		install -m 0755    ${WORKDIR}/corgikeymap-2.6.map		${D}${sysconfdir}
+		install -m 0755    ${WORKDIR}/keymap				${D}${sysconfdir}/init.d
+		ln -sf          ../init.d/keymap  				${D}${sysconfdir}/rcS.d/S04keymap
 	fi
 
 
-	install -m 0755 ${WORKDIR}/banner	${D}/${sysconfdir}/init.d/banner
-	install -m 0755 ${WORKDIR}/devices	${D}/${sysconfdir}/init.d/devices
-	install -m 0755 ${WORKDIR}/umountfs	${D}/${sysconfdir}/init.d/umountfs
+	install -m 0755 ${WORKDIR}/banner	${D}${sysconfdir}/init.d/banner
+	install -m 0755 ${WORKDIR}/devices	${D}${sysconfdir}/init.d/devices
+	install -m 0755 ${WORKDIR}/umountfs	${D}${sysconfdir}/init.d/umountfs
 #
 # Create runlevel links
 #
-	ln -sf		../init.d/rmnologin	${D}/${sysconfdir}/rc2.d/S99rmnologin
-	ln -sf		../init.d/rmnologin	${D}/${sysconfdir}/rc3.d/S99rmnologin
-	ln -sf		../init.d/rmnologin	${D}/${sysconfdir}/rc4.d/S99rmnologin
-	ln -sf		../init.d/rmnologin	${D}/${sysconfdir}/rc5.d/S99rmnologin
-	ln -sf		../init.d/sendsigs	${D}/${sysconfdir}/rc6.d/S20sendsigs
-#	ln -sf		../init.d/urandom	${D}/${sysconfdir}/rc6.d/S30urandom
-	ln -sf		../init.d/umountnfs.sh	${D}/${sysconfdir}/rc6.d/S31umountnfs.sh
-#	ln -sf		../init.d/umountfs	${D}/${sysconfdir}/rc6.d/S40umountfs
-	ln -sf          ../init.d/ramdisk       ${D}/${sysconfdir}/rcS.d/S30ramdisk 
-	ln -sf		../init.d/reboot	${D}/${sysconfdir}/rc6.d/S90reboot
-	ln -sf		../init.d/sendsigs	${D}/${sysconfdir}/rc0.d/S20sendsigs
-#	ln -sf		../init.d/urandom	${D}/${sysconfdir}/rc0.d/S30urandom
-	ln -sf		../init.d/umountnfs.sh	${D}/${sysconfdir}/rc0.d/S31umountnfs.sh
-#	ln -sf		../init.d/umountfs	${D}/${sysconfdir}/rc0.d/S40umountfs
-	ln -sf		../init.d/halt		${D}/${sysconfdir}/rc0.d/S90halt
-	ln -sf		../init.d/banner	${D}/${sysconfdir}/rcS.d/S01banner
-	ln -sf		../init.d/checkroot.sh	${D}/${sysconfdir}/rcS.d/S10checkroot.sh
-#	ln -sf		../init.d/checkfs.sh	${D}/${sysconfdir}/rcS.d/S30checkfs.sh
-	ln -sf		../init.d/mountall.sh	${D}/${sysconfdir}/rcS.d/S35mountall.sh
-	ln -sf		../init.d/hostname.sh	${D}/${sysconfdir}/rcS.d/S40hostname.sh
-	ln -sf		../init.d/mountnfs.sh	${D}/${sysconfdir}/rcS.d/S45mountnfs.sh
-	ln -sf		../init.d/bootmisc.sh	${D}/${sysconfdir}/rcS.d/S55bootmisc.sh
-#	ln -sf		../init.d/urandom	${D}/${sysconfdir}/rcS.d/S55urandom
-	ln -sf		../init.d/finish	${D}/${sysconfdir}/rcS.d/S99finish
-	ln -sf		../init.d/devices	${D}/${sysconfdir}/rcS.d/S04devices
+	ln -sf		../init.d/rmnologin	${D}${sysconfdir}/rc2.d/S99rmnologin
+	ln -sf		../init.d/rmnologin	${D}${sysconfdir}/rc3.d/S99rmnologin
+	ln -sf		../init.d/rmnologin	${D}${sysconfdir}/rc4.d/S99rmnologin
+	ln -sf		../init.d/rmnologin	${D}${sysconfdir}/rc5.d/S99rmnologin
+	ln -sf		../init.d/sendsigs	${D}${sysconfdir}/rc6.d/S20sendsigs
+#	ln -sf		../init.d/urandom	${D}${sysconfdir}/rc6.d/S30urandom
+	ln -sf		../init.d/umountnfs.sh	${D}${sysconfdir}/rc6.d/S31umountnfs.sh
+#	ln -sf		../init.d/umountfs	${D}${sysconfdir}/rc6.d/S40umountfs
+	ln -sf          ../init.d/ramdisk       ${D}${sysconfdir}/rcS.d/S30ramdisk 
+	ln -sf		../init.d/reboot	${D}${sysconfdir}/rc6.d/S90reboot
+	ln -sf		../init.d/sendsigs	${D}${sysconfdir}/rc0.d/S20sendsigs
+#	ln -sf		../init.d/urandom	${D}${sysconfdir}/rc0.d/S30urandom
+	ln -sf		../init.d/umountnfs.sh	${D}${sysconfdir}/rc0.d/S31umountnfs.sh
+#	ln -sf		../init.d/umountfs	${D}${sysconfdir}/rc0.d/S40umountfs
+	ln -sf		../init.d/halt		${D}${sysconfdir}/rc0.d/S90halt
+	ln -sf		../init.d/banner	${D}${sysconfdir}/rcS.d/S01banner
+	ln -sf		../init.d/checkroot.sh	${D}${sysconfdir}/rcS.d/S10checkroot.sh
+#	ln -sf		../init.d/checkfs.sh	${D}${sysconfdir}/rcS.d/S30checkfs.sh
+	ln -sf		../init.d/mountall.sh	${D}${sysconfdir}/rcS.d/S35mountall.sh
+	ln -sf		../init.d/hostname.sh	${D}${sysconfdir}/rcS.d/S40hostname.sh
+	ln -sf		../init.d/mountnfs.sh	${D}${sysconfdir}/rcS.d/S45mountnfs.sh
+	ln -sf		../init.d/bootmisc.sh	${D}${sysconfdir}/rcS.d/S55bootmisc.sh
+#	ln -sf		../init.d/urandom	${D}${sysconfdir}/rcS.d/S55urandom
+	ln -sf		../init.d/finish	${D}${sysconfdir}/rcS.d/S99finish
+	ln -sf		../init.d/devices	${D}${sysconfdir}/rcS.d/S04devices
 	# udev will run at S03 if installed
-	ln -sf		../init.d/sysfs.sh	${D}/${sysconfdir}/rcS.d/S02sysfs
-	ln -sf		../init.d/devpts.sh	${D}/${sysconfdir}/rcS.d/S38devpts.sh
+	ln -sf		../init.d/sysfs.sh	${D}${sysconfdir}/rcS.d/S02sysfs
+	ln -sf		../init.d/devpts.sh	${D}${sysconfdir}/rcS.d/S38devpts.sh
 	if [ "${TARGET_ARCH}" = "arm" ]; then
-		ln -sf	../init.d/alignment.sh	${D}/${sysconfdir}/rcS.d/S05alignment
+		ln -sf	../init.d/alignment.sh	${D}${sysconfdir}/rcS.d/S05alignment
 	fi
 
-	install -m 0755    ${WORKDIR}/device_table.txt		${D}/${sysconfdir}/device_table
+	install -m 0755    ${WORKDIR}/device_table.txt		${D}${sysconfdir}/device_table
 }