Rename updates after the recent nslu2 merge.

BKrev: 41b7ad47lCNmwOlCvE1A_nD66bIcBw

12 files changed, 102 insertions, 26 deletions

diff --git a/busybox/slingbox_1.00.bb b/busybox/slingbox_1.00.bb
index d9849b59d5..155052eabd 100644
--- a/busybox/slingbox_1.00.bb
+++ b/busybox/slingbox_1.00.bb
@@ -15,8 +15,8 @@ S = "${WORKDIR}/busybox-${PV}"
 
 python () {
 	# Don't build slingbox unless we're targeting an nslu2
-	if oe.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise oe.parse.SkipPackage("switchbox only builds for the Linksys NSLU2")
+	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
+		raise bb.parse.SkipPackage("switchbox only builds for the Linksys NSLU2")
 }
 
 export EXTRA_CFLAGS = "${CFLAGS}"
diff --git a/busybox/switchbox_1.00.bb b/busybox/switchbox_1.00.bb
index b9e4fb0648..59b422a5fd 100644
--- a/busybox/switchbox_1.00.bb
+++ b/busybox/switchbox_1.00.bb
@@ -17,8 +17,8 @@ S = "${WORKDIR}/busybox-${PV}"
 
 python () {
 	# Don't build switchbox unless we're targeting an nslu2
-	if oe.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise oe.parse.SkipPackage("switchbox only builds for the Linksys NSLU2")
+	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
+		raise bb.parse.SkipPackage("switchbox only builds for the Linksys NSLU2")
 }
 
 LDFLAGS =+ "-static"
diff --git a/linux/nslu2-linksys-kernel_2.4.22.bb b/linux/nslu2-linksys-kernel_2.4.22.bb
index f7c41a4a11..0421d69c6e 100644
--- a/linux/nslu2-linksys-kernel_2.4.22.bb
+++ b/linux/nslu2-linksys-kernel_2.4.22.bb
@@ -18,8 +18,8 @@ S = "${WORKDIR}/linux-2.4.22"
 
 python () {
 	# Don't build unless we're targeting an nslu2
-	if oe.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise oe.parse.SkipPackage("NSLU2 kernel only builds for the Linksys NSLU2")
+	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
+		raise bb.parse.SkipPackage("NSLU2 kernel only builds for the Linksys NSLU2")
 }
 
 COMPATIBLE_HOST = 'arm.*-linux'
diff --git a/linux/openslug-kernel_2.6.9.bb b/linux/openslug-kernel_2.6.9.bb
index 3e94b29e81..0e48638e5b 100644
--- a/linux/openslug-kernel_2.6.9.bb
+++ b/linux/openslug-kernel_2.6.9.bb
@@ -51,8 +51,8 @@ addtask deploy before do_build after do_compile
 
 python () {
 	# Don't build openslug kernel unless we're targeting an nslu2
-	mach = oe.data.getVar("MACHINE", d, 1)
-	dist = oe.data.getVar("DISTRO", d, 1)
+	mach = bb.data.getVar("MACHINE", d, 1)
+	dist = bb.data.getVar("DISTRO", d, 1)
 	if mach != 'nslu2' or dist != 'openslug':
-		raise oe.parse.SkipPackage("OpenSlug only builds for the Linksys NSLU2")
+		raise bb.parse.SkipPackage("OpenSlug only builds for the Linksys NSLU2")
 }
diff --git a/linux/unslung-standard-kernel_2.3r25.bb b/linux/unslung-standard-kernel_2.3r25.bb
index 53a23d5a81..678582fb2d 100644
--- a/linux/unslung-standard-kernel_2.3r25.bb
+++ b/linux/unslung-standard-kernel_2.3r25.bb
@@ -22,8 +22,8 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel-${PV}/${UNS
 
 python () {
 	# Don't build unslung kernel unless we're targeting an nslu2
-	mach = oe.data.getVar("MACHINE", d, 1)
-	dist = oe.data.getVar("DISTRO", d, 1)
+	mach = bb.data.getVar("MACHINE", d, 1)
+	dist = bb.data.getVar("DISTRO", d, 1)
 	if mach != 'nslu2' or dist != 'unslung':
-		raise oe.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
+		raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
 }
diff --git a/meta/openslug-image.bb b/meta/openslug-image.bb
index 94f91963da..9f672ff9dd 100644
--- a/meta/openslug-image.bb
+++ b/meta/openslug-image.bb
@@ -26,8 +26,8 @@ inherit image_ipk
 
 python () {
 	# Don't build openslug images unless we're targeting an nslu2
-	mach = oe.data.getVar("MACHINE", d, 1)
-	dist = oe.data.getVar("DISTRO", d, 1)
+	mach = bb.data.getVar("MACHINE", d, 1)
+	dist = bb.data.getVar("DISTRO", d, 1)
 	if mach != 'nslu2' or dist != 'openslug':
-		raise oe.parse.SkipPackage("OpenSlug only builds for the Linksys NSLU2")
+		raise bb.parse.SkipPackage("OpenSlug only builds for the Linksys NSLU2")
 }
diff --git a/meta/unslung-standard-image.bb b/meta/unslung-standard-image.bb
index 9104c7ef38..8edaa69979 100644
--- a/meta/unslung-standard-image.bb
+++ b/meta/unslung-standard-image.bb
@@ -33,8 +33,8 @@ unslung_clean_image () {
 
 python () {
 	# Don't build unslung images unless we're targeting an nslu2
-	mach = oe.data.getVar("MACHINE", d, 1)
-	dist = oe.data.getVar("DISTRO", d, 1)
+	mach = bb.data.getVar("MACHINE", d, 1)
+	dist = bb.data.getVar("DISTRO", d, 1)
 	if mach != 'nslu2' or dist != 'unslung':
-		raise oe.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
+		raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
 }
diff --git a/nslu2-binary-only/nslu2-linksys-firmware_2.3r25.bb b/nslu2-binary-only/nslu2-linksys-firmware_2.3r25.bb
index 9630ecf2bf..12b7b82fc1 100644
--- a/nslu2-binary-only/nslu2-linksys-firmware_2.3r25.bb
+++ b/nslu2-binary-only/nslu2-linksys-firmware_2.3r25.bb
@@ -9,8 +9,8 @@ S = "${WORKDIR}"
 
 python () {
 	# Don't build unless we're targeting an nslu2
-	if oe.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise oe.parse.SkipPackage("NSLU2 firmware only builds for the Linksys NSLU2")
+	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
+		raise bb.parse.SkipPackage("NSLU2 firmware only builds for the Linksys NSLU2")
 }
 
 do_compile () {
diff --git a/nslu2-binary-only/nslu2-linksys-libs_2.3r25.bb b/nslu2-binary-only/nslu2-linksys-libs_2.3r25.bb
index 7b6b963b6b..90f768d417 100644
--- a/nslu2-binary-only/nslu2-linksys-libs_2.3r25.bb
+++ b/nslu2-binary-only/nslu2-linksys-libs_2.3r25.bb
@@ -17,6 +17,6 @@ FILES_${PN} = "/lib"
 
 python () {
 	# Don't build unless we're targeting an nslu2
-	if oe.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise oe.parse.SkipPackage("NSLU2 stock firmware libraries only builds for the Linksys NSLU2")
+	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
+		raise bb.parse.SkipPackage("NSLU2 stock firmware libraries only builds for the Linksys NSLU2")
 }
diff --git a/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r25.bb b/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r25.bb
index d7748912a6..f20a2779a3 100644
--- a/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r25.bb
+++ b/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r25.bb
@@ -15,6 +15,6 @@ FILES_${PN} = "/"
 
 python () {
 	# Don't build unless we're targeting an nslu2
-	if oe.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise oe.parse.SkipPackage("NSLU2 ramdisk only builds for the Linksys NSLU2")
+	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
+		raise bb.parse.SkipPackage("NSLU2 ramdisk only builds for the Linksys NSLU2")
 }
diff --git a/nslu2-binary-only/nslu2-switchbox-firmware.bb b/nslu2-binary-only/nslu2-switchbox-firmware.bb
index 0f86d88dec..fb06aa5fdd 100644
--- a/nslu2-binary-only/nslu2-switchbox-firmware.bb
+++ b/nslu2-binary-only/nslu2-switchbox-firmware.bb
@@ -9,9 +9,9 @@ S = "${WORKDIR}"
 
 python () {
 	# Don't build switchbox firmware unless we're targeting an nslu2
-	mach = oe.data.getVar("MACHINE", d, 1)
+	mach = bb.data.getVar("MACHINE", d, 1)
 	if mach != 'nslu2':
-		raise oe.parse.SkipPackage("Switchbox is only relevant for the Linksys NSLU2")
+		raise bb.parse.SkipPackage("Switchbox is only relevant for the Linksys NSLU2")
 }
 
 do_compile () {
diff --git a/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb b/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb
index e69de29bb2..f3be5fba17 100644
--- a/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb
+++ b/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb
@@ -0,0 +1,76 @@
+SECTION = "base"
+
+PR = "r28"
+
+UNSLUNG_VERSION = "3.8-alpha"
+UNSLUNG_VARIANT ?= "standard"
+
+DEPENDS = "nslu2-linksys-libs"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-rootfs-${PV}/${UNSLUNG_VARIANT}', '${FILE_DIRNAME}/unslung-rootfs-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r25.tar.bz2 \
+	   file://README \
+	   file://linuxrc \
+	   file://unsling \
+	   file://resling \
+	   file://rc.unslung \
+	   file://rc-diversion.patch;patch=1 \
+	   file://rc.1-diversion.patch;patch=1 \
+	   file://rc.crond-diversion.patch;patch=1 \
+	   file://rc.halt-diversion.patch;patch=1 \
+	   file://rc.local-diversion.patch;patch=1 \
+	   file://rc.modules-diversion.patch;patch=1 \
+	   file://rc.network-diversion.patch;patch=1 \
+	   file://rc.quickset-diversion.patch;patch=1 \
+	   file://rc.quota-diversion.patch;patch=1 \
+	   file://rc.reboot-diversion.patch;patch=1 \
+	   file://rc.reset_usrgrpshare-diversion.patch;patch=1 \
+	   file://rc.rstimezone-diversion.patch;patch=1 \
+	   file://rc.samba-diversion.patch;patch=1 \
+	   file://rc.sysinit-diversion.patch;patch=1 \
+	   file://rc.thttpd-diversion.patch;patch=1 \
+	   file://rc.xinetd-diversion.patch;patch=1 \
+	   file://root-passwd.patch;patch=1 \
+	   file://create-ramdisks.patch;patch=1 \
+	   file://remount-noatime.patch;patch=1 \
+	   file://initialise-mtab.patch;patch=1 \
+	   "
+
+S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r25"
+
+python () {
+	# Don't build unslung images unless we're targeting an nslu2
+	mach = bb.data.getVar("MACHINE", d, 1)
+	dist = bb.data.getVar("DISTRO", d, 1)
+	if mach != 'nslu2' or dist != 'unslung':
+		raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
+}
+
+do_compile () {
+	echo "V2.3R25-uNSLUng-${UNSLUNG_VARIANT}-${UNSLUNG_VERSION}" > ${S}/.unslung
+
+	sed -i -e s/@version#/@version#-uNSLUng-${UNSLUNG_VARIANT}-${UNSLUNG_VERSION}/ ${S}/home/httpd/html/home.htm
+	sed -i -e 's|>&nbsp;<|><a href="Unslung" class="mainmenu" target="_top">Unslung Doco</a><|' \
+		${S}/home/httpd/html/manhead.htm
+
+	install -m 755 ${WORKDIR}/linuxrc ${S}/linuxrc
+	install -m 755 ${WORKDIR}/unsling ${S}/sbin/unsling
+	install -m 755 ${WORKDIR}/resling ${S}/sbin/resling
+	install -m 755 ${WORKDIR}/rc.unslung ${S}/etc/rc.d/rc.unslung
+
+	install -d ${S}/opt/doc
+	install -m 755 ${WORKDIR}/README ${S}/opt/doc/README
+	ln -s /opt/doc ${S}/home/httpd/html/Unslung
+
+	# Remove the libraries, because they are in nslu2-linksys-libs now
+	rm -rf ${S}/lib
+}
+
+do_install () {
+	( cd ${S} ; tar -c -v -f - --exclude '*\~*' --exclude '.patches' . ) | ( cd ${D} ; tar xvf - )
+}
+
+PACKAGES = "${PN}"
+FILES_${PN} = "/"
+RDEPENDS_${PN} = "nslu2-linksys-libs"