[oe-commits] org.oe.dev foonas-init: Remove unneeded scripts

[nail commit]

foonas-init: Remove unneeded scripts

Author: nail at nslu2-linux.org
Branch: org.openembedded.dev
Revision: b89e1b530711af5b74dadfb5165d37e4a2a9caae
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b89e1b530711af5b74dadfb5165d37e4a2a9caae
Files:
1
packages/foonas-init/files/boot
packages/foonas-init/files/boot/disk
packages/foonas-init/files/boot/flash
packages/foonas-init/files/boot/network
packages/foonas-init/files/boot/nfs
packages/foonas-init/files/boot/udhcpc.script
packages/foonas-init/foonas-init_0.10.bb
Diffs:

#
# mt diff -rade61563a78e3420a8fb039657a8ebff1f54bccf -rb89e1b530711af5b74dadfb5165d37e4a2a9caae
#
# 
# 
# delete "packages/foonas-init/files/boot"
# 
# delete "packages/foonas-init/files/boot/disk"
# 
# delete "packages/foonas-init/files/boot/flash"
# 
# delete "packages/foonas-init/files/boot/network"
# 
# delete "packages/foonas-init/files/boot/nfs"
# 
# delete "packages/foonas-init/files/boot/udhcpc.script"
# 
# patch "packages/foonas-init/foonas-init_0.10.bb"
#  from [c60dc0bdb01bcdcbd5d0576d31a0bff0694fb759]
#    to [bccfa4f698862fe9c7b32214be5b31a13e917ebb]
# 
============================================================
--- packages/foonas-init/foonas-init_0.10.bb	c60dc0bdb01bcdcbd5d0576d31a0bff0694fb759
+++ packages/foonas-init/foonas-init_0.10.bb	bccfa4f698862fe9c7b32214be5b31a13e917ebb
@@ -1,17 +1,12 @@ RDEPENDS = "busybox devio"
 DESCRIPTION = "FooNAS initial boot and config"
 SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "file://boot/flash \
-	   file://boot/disk \
-	   file://boot/nfs \
-	   file://boot/network \
-	   file://boot/udhcpc.script \
-	   file://initscripts/fixfstab \
+SRC_URI = "file://initscripts/fixfstab \
 	   file://initscripts/syslog.buffer \
 	   file://initscripts/syslog.file \
 	   file://initscripts/syslog.network \
@@ -32,7 +27,6 @@ SCRIPTS = "turnup reflash sysconf"
 USRSBINPROGS = ""
 CPROGS = "${USRSBINPROGS} ${SBINPROGS}"
 SCRIPTS = "turnup reflash sysconf"
-BOOTSCRIPTS = "flash disk nfs network udhcpc.script"
 INITSCRIPTS = "syslog.buffer syslog.file syslog.network \
 	rmrecovery sysconfsetup umountinitrd.sh \
 	fixfstab loadmodules.sh"
@@ -62,12 +56,7 @@ do_install() {
 		   ${D}${sbindir} \
 		   ${D}${base_sbindir} \
 		   ${D}/initrd \
-		   ${D}/boot
 
-	# linuxrc
-	rm -f ${D}/linuxrc
-	ln -s boot/flash ${D}/linuxrc
-
 	# C programs
 	for p in ${USRSBINPROGS}
 	do
@@ -97,13 +86,6 @@ do_install() {
 	# Udev configuration files
 	install -m 0644 links.conf ${D}${sysconfdir}/udev
 
-	#
-	# Boot scripts
-	for p in ${BOOTSCRIPTS}
-	do
-		install -m 0755 boot/$p ${D}/boot
-	done
-
 	# Configuration files
 	install -m 0644 conffiles ${D}${sysconfdir}/default
 
@@ -138,7 +120,3 @@ FILES_${PN} = "/"
 
 PACKAGES = "${PN}"
 FILES_${PN} = "/"
-
-# It is bad to overwrite /linuxrc as it puts the system back to
-# a flash boot (and the flash has potentially not been upgraded!)
-CONFFILES_${PN} = "/linuxrc ${sysconfdir}/default/conffiles"