slugos: remove/correct references to openslug

 - apex: contains an absolute build sys path name (commented)
 - base-files: rename openslug to slugos in 3.0.14
 - busybox: rename openslug to slugos in 1.00, 1.01
 - netbase: rename openslug to slugos in 4.21
 - slugos-init: rename openslug to slugos in 0.10
 - all others: remove or replace openslug in comments (no
   build changes)

16 files changed, 29 insertions, 27 deletions

diff --git a/packages/apex/apex_1.2.19.bb b/packages/apex/apex_1.2.19.bb
index 2b022e94e7..6ef684935c 100644
--- a/packages/apex/apex_1.2.19.bb
+++ b/packages/apex/apex_1.2.19.bb
@@ -12,6 +12,8 @@ SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
 EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
 
 oe_runmake() {
+	#FIXME: /home/slug/openslug/tmp/cross/bin/armeb-linux- is incorrect, but
+	# the cross bin directory should be on the PATH
 	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=/home/slug/openslug/tmp/cross/bin/armeb-linux- "$@"
 	make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=/home/slug/openslug/tmp/cross/bin/armeb-linux- "$@" || die "oe_runmake failed"
 }
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index d23c43046a..1f06cc1036 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r45"
+PR = "r46"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -46,7 +46,7 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
 	     ${sysconfdir}/default"
 
 hostname = "openembedded"
-hostname_openslug = "openslug"
+hostname_slugos = "nslu2"
 hostname_mnci = "MNCI"
 PACKAGE_ARCH_mnci = "mnci"
 hostname_rt3000 = "MNRT"
@@ -121,7 +121,7 @@ do_install_append_nylon() {
 	ln -sf /var/tmp ${D}/tmp
 }
 
-do_install_append_openslug() {
+do_install_append_slugos() {
 	printf "" "" >${D}${sysconfdir}/resolv.conf
 	rm -r ${D}/mnt/*
 	rmdir ${D}/home/root
@@ -146,5 +146,5 @@ FILES_${PN}-unslung = ""
 
 CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname"
 CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
-CONFFILES_${PN}_openslug = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
+CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
 
diff --git a/packages/base-passwd/base-passwd-3.5.9/slugos/README b/packages/base-passwd/base-passwd-3.5.9/slugos/README
index 05c2e419f5..1abe54b5a2 100644
--- a/packages/base-passwd/base-passwd-3.5.9/slugos/README
+++ b/packages/base-passwd/base-passwd-3.5.9/slugos/README
@@ -1,4 +1,5 @@
-This patch overrides the root-home.patch for DISTRO=openslug
+This patch overrides the root-home.patch for all DISTROs
+derived from slugos (DISTROs which set slugos in OVERRIDES)
 
 The patch sets a root password on /etc/passwd, this password is
 
diff --git a/packages/busybox/busybox-1.00/slugos/udhcpscript.patch b/packages/busybox/busybox-1.00/slugos/udhcpscript.patch
index 010f64a53f..2f58632378 100644
--- a/packages/busybox/busybox-1.00/slugos/udhcpscript.patch
+++ b/packages/busybox/busybox-1.00/slugos/udhcpscript.patch
@@ -2,7 +2,7 @@
 +++ busybox-1.00/examples/udhcp/simple.script	2005-06-05 15:08:28.432605118 -0700
 @@ -1,40 +1,101 @@
  #!/bin/sh
-+# openslug UDHCP client script
++# slugos UDHCP client script
 +# this must set the HW address (MAC) on the interface
 +#
 +. /etc/default/functions
diff --git a/packages/busybox/busybox-1.01/slugos/udhcpscript.patch b/packages/busybox/busybox-1.01/slugos/udhcpscript.patch
index 010f64a53f..2f58632378 100644
--- a/packages/busybox/busybox-1.01/slugos/udhcpscript.patch
+++ b/packages/busybox/busybox-1.01/slugos/udhcpscript.patch
@@ -2,7 +2,7 @@
 +++ busybox-1.00/examples/udhcp/simple.script	2005-06-05 15:08:28.432605118 -0700
 @@ -1,40 +1,101 @@
  #!/bin/sh
-+# openslug UDHCP client script
++# slugos UDHCP client script
 +# this must set the HW address (MAC) on the interface
 +#
 +. /etc/default/functions
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 988265d72c..f1ea81a7b8 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r30"
+PR = "r31"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://add-getkey-applet.patch;patch=1 \
@@ -56,8 +56,8 @@ INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
 INITSCRIPT_NAME_${PN} = "syslog"
 CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
 
-# This disables the syslog startup links in openslug (see openslug-init)
-INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ."
+# This disables the syslog startup links in slugos (see slugos-init)
+INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ."
 
 inherit cml1 update-rc.d
 
diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index 6da22dbe9d..49af0e3513 100644
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://udhcppidfile.patch;patch=1 \
@@ -55,8 +55,8 @@ INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
 INITSCRIPT_NAME_${PN} = "syslog"
 CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
 
-# This disables the syslog startup links in openslug (see openslug-init)
-INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ."
+# This disables the syslog startup links in slugos (see slugos-init)
+INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ."
 
 inherit cml1 update-rc.d
 
diff --git a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
index aa5e74f551..a0571bedb7 100644
--- a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
+++ b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
@@ -40,7 +40,7 @@ do_deploy[dirs] = "${S}"
 addtask deploy before do_build after do_compile
 
 python () {
-	# Don't build openslug kernel unless we're targeting an nslu2
+	# Don't build kernel unless we're targeting an nslu2
 	mach = bb.data.getVar("MACHINE", d, 1)
 	if mach != 'devkitidp-pxa255':
 		raise bb.parse.SkipPackage("This kernel only builds for the PXA255 DevKitIDP")
diff --git a/packages/linux/linux-wrt_2.4.20.bb b/packages/linux/linux-wrt_2.4.20.bb
index e7ce9a3756..9eb3218f6e 100644
--- a/packages/linux/linux-wrt_2.4.20.bb
+++ b/packages/linux/linux-wrt_2.4.20.bb
@@ -59,7 +59,7 @@ do_deploy[dirs] = "${S}"
 addtask deploy before do_build after do_compile
 
 python () {
-	# Don't build openslug kernel unless we're targeting a wrt
+	# Don't build kernel unless we're targeting a wrt
 	mach = bb.data.getVar("MACHINE", d, 1)
 	if mach != 'wrt54':
 		raise bb.parse.SkipPackage("Unable to build for non-WRT54 device.")
diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb
index 1676562a93..efcd20df9b 100644
--- a/packages/linux/linux-wrt_2.4.30.bb
+++ b/packages/linux/linux-wrt_2.4.30.bb
@@ -113,7 +113,7 @@ do_deploy[dirs] = "${S}"
 addtask deploy before do_build after do_compile
 
 python () {
-	# Don't build openslug kernel unless we're targeting a wrt
+	# Don't build kernel unless we're targeting a wrt
 	mach = bb.data.getVar("MACHINE", d, 1)
 	if mach != 'wrt54':
 		raise bb.parse.SkipPackage("Unable to build for non-WRT54 device.")
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index 39dcb6bed3..f41b61c033 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -150,9 +150,8 @@ N2K_PATCHES ?= ""
 
 # Image suffix - actually set in conf/machine/nslu2.conf as it is also
 # used by anything which needs to know the name of the generated image.
-# May be overridden in the distro if patches or defconfig are changed.
-#FIXME: this can be removed, it is just here for safety with the old names.
-N2K_SUFFIX ?= "openslug"
+# Should be overridden in the distro if patches or defconfig are changed.
+N2K_SUFFIX ?= "nslu2${ARCH_BYTE_SEX}"
 
 SRC_URI  = "${N2K_SRCURI}"
 SRC_URI += "${N2K_PATCHES}"
diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb
index 9be275c862..ad16b6ae93 100644
--- a/packages/meta/slugos-image.bb
+++ b/packages/meta/slugos-image.bb
@@ -90,7 +90,7 @@ USE_DEVFS = "1"
 # diff, cpio and find are required for reflash and turnup ram.
 # Removing these probably leaves the system bootable, but standard
 # openslug and ucslugc stuff won't work, so only take these out in
-# very non-standard turnkey ucslugc builds.
+# very non-standard turnkey slugos builds.
 #
 # udev is the default way of handling devices, there is no guarantee
 # that the static device table is completely correct (it is just
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index 4046e64d79..e875d8f621 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 LICENSE = "GPL"
-PR = "r7"
+PR = "r8"
 
 inherit update-rc.d
 
@@ -10,9 +10,9 @@ INITSCRIPT_NAME = "networking"
 INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ."
 # On MNCI etc, start very late so that our own apps come up faster
 INITSCRIPT_PARAMS_openmn = "start 85 1 2 3 4 5 . stop 85 0 6 1 ."
-# On OpenSlug delay the stop until after network apps have exited
+# On SlugOS (NSLU2) delay the stop until after network apps have exited
 # Do not stop in single user - there's no way to sulogin!
-INITSCRIPT_PARAMS_openslug = "start 40 S 0 6 ."
+INITSCRIPT_PARAMS_slugos = "start 40 S 0 6 ."
 
 SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \
            file://options \
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index e78a4829af..a960439ad2 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -53,7 +53,7 @@ RPROVIDES_perl-lib = "perl-lib"
 include perl-rdepends_${PV}.inc
 
 # To create/update the perl-rdepends_${PV}.inc use this piece of ugly script (modified for your arch/paths etc):
-# daka@DaKa2:/home/slug/openslug/tmp/work/perl-5.8.7-r14/install$ egrep -r "use|require" * | grep ";$" | egrep ".pm:use |.pm:require " | grep -v v5.6.0 | grep -v 5.00 | grep -v \$module | sed -e "s, \+, ,g" | cut -f1,2 -d" " | sed -e "s,;, ,g" | sed -e "s,(), ,g" | sed -e "s,::,-,g" | sort | uniq | tr [:upper:] [:lower:] | sed -e "s,/[^ ]\+ , += \"perl-module-,g" | sed -e "s, \?$, \",g" | sed -e "s,_,-,g" | sed -e "s,^,RDEPENDS_,g" | sed -e "s,armeb-linux,\$\{TARGET_ARCH\}-\$\{TARGET_OS\},g" | egrep -v "perl-module-5|perl-module-tk|perl-module-mac-internetconfig|perl-module-ndbm-file|perl-module-html-treebuilder|perl-module-lwp-simple|perl-module-vms-filespec|perl-module-fcgi|perl-module-vms-stdio|perl-module-mac-buildtools" > /home/slug/openembedded/packages/perl/perl-rdepends_5.8.7.inc
+# daka@DaKa2:/home/slug/slugos/tmp/work/perl-5.8.7-r14/install$ egrep -r "use|require" * | grep ";$" | egrep ".pm:use |.pm:require " | grep -v v5.6.0 | grep -v 5.00 | grep -v \$module | sed -e "s, \+, ,g" | cut -f1,2 -d" " | sed -e "s,;, ,g" | sed -e "s,(), ,g" | sed -e "s,::,-,g" | sort | uniq | tr [:upper:] [:lower:] | sed -e "s,/[^ ]\+ , += \"perl-module-,g" | sed -e "s, \?$, \",g" | sed -e "s,_,-,g" | sed -e "s,^,RDEPENDS_,g" | sed -e "s,armeb-linux,\$\{TARGET_ARCH\}-\$\{TARGET_OS\},g" | egrep -v "perl-module-5|perl-module-tk|perl-module-mac-internetconfig|perl-module-ndbm-file|perl-module-html-treebuilder|perl-module-lwp-simple|perl-module-vms-filespec|perl-module-fcgi|perl-module-vms-stdio|perl-module-mac-buildtools" > /home/slug/openembedded/packages/perl/perl-rdepends_5.8.7.inc
 
 # Some packages changed names in 5.8.7-r14, RPROVIDE them
 RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata"
diff --git a/packages/slugos-init/files/initscripts/sysconfsetup b/packages/slugos-init/files/initscripts/sysconfsetup
index 31ff38d7ee..4111633a2b 100644
--- a/packages/slugos-init/files/initscripts/sysconfsetup
+++ b/packages/slugos-init/files/initscripts/sysconfsetup
@@ -59,7 +59,7 @@ then
 	# to examine the current settings.  The badly formatted stuff
 	# is removed (to be exact, the sed script selects only lines
 	# which match one of the two above).  The lan interface, which
-	# defaults to ixp0, is changed to the correct value for openslug,
+	# defaults to ixp0, is changed to the correct value for slugos,
 	# eth0.  The bootproto, which LinkSys sets to static in manufacturing,
 	# is reset to dhcp if the IP is still the original (192.168.1.77)
 	devio "<<$sysdev" cpb fb1,10 | sed -n '/^\[[^][]*\]$/p;
@@ -138,7 +138,7 @@ test -n "$domain" && echo "$domain" >/etc/defaultdomain
 #
 # Ethernet information.  This goes into /etc/network/interfaces,
 # however this is only used for static setup (and this is not
-# the default).  With dhcp the openslug udhcp script,
+# the default).  With dhcp the slugos udhcp script,
 # /etc/udhcpc.d/50default, loads the values from sysconf.  The
 # lan_interface config value must exist for the file to be
 # overwritten here.
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 4719b9dcca..4bca35f47f 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r46"
+PR = "r47"
 
 SRC_URI = "file://linuxrc \
 	   file://boot/flash \