slugos: Major rename of common SlugOS files and directories from openslug to slugos.

diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 36c48e2..efafe69 100644 (file)
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -148,7 +148,6 @@ ${PKGDIR}/packages/openldap/*.bb \
 ${PKGDIR}/packages/openntpd/*.bb \
 ${PKGDIR}/packages/openobex-apps/*.bb \
 ${PKGDIR}/packages/openobex/*.bb \
-${PKGDIR}/packages/openslug-init/*.bb \
 ${PKGDIR}/packages/opensp/*.bb \
 ${PKGDIR}/packages/openssh/*.bb \
 ${PKGDIR}/packages/openssl/*.bb \
@@ -185,6 +184,7 @@ ${PKGDIR}/packages/sed/*.bb \
 ${PKGDIR}/packages/setpwc/*.bb \
 ${PKGDIR}/packages/sgml-common/*.bb \
 ${PKGDIR}/packages/slugimage/*.bb \
+${PKGDIR}/packages/slugos-init/*.bb \
 ${PKGDIR}/packages/ssmtp/*.bb \
 ${PKGDIR}/packages/strace/*.bb \
 ${PKGDIR}/packages/streamripper/*.bb \

diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 6ebec41..21f1ae5 100644 (file)
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -21,9 +21,8 @@
 #
 # The following names are deprecated:
 #
-# openslug - the historical name of a canonical nslu2-bag distro,
-#            used generically for NSLU2 specific distro features and
-#            the default OVERRIDE for all these NSLU2 builds
+# openslug - the historical name of a canonical nslu2-bag distro
+#            also the name of a standard nslu2-bag distro with a package feed
 # ucslugc  - the historical (and obsolete) name of nslu2-btu
 #            also the name of a standard nslu2-btu distro with a package feed
 #
@@ -62,10 +61,7 @@ USE_NLS_glib-2.0 = "yes"
 
 INHERIT += "package_ipk debian"
 
-# The value of DISTRO_BASE is set to 'openslug' to pick up the original openslug
-# overrides, slugos is the preferred override!
-#FIXME: remove openslug
-DISTRO_BASE = ":slugos:openslug"
+DISTRO_BASE = ":slugos"
 
 # packages/meta/slugos-image.bb generates a binary image of the root file system
 # with a name controlled by the following setting - it defaults to the top level

diff --git a/packages/base-files/base-files/openslug/.mtn2git_empty b/packages/base-files/base-files/slugos/.mtn2git_empty
similarity index 100%
rename from packages/base-files/base-files/openslug/.mtn2git_empty
rename to packages/base-files/base-files/slugos/.mtn2git_empty

diff --git a/packages/base-files/base-files/openslug/fstab b/packages/base-files/base-files/slugos/fstab
similarity index 100%
rename from packages/base-files/base-files/openslug/fstab
rename to packages/base-files/base-files/slugos/fstab

diff --git a/packages/base-passwd/base-passwd-3.5.9/openslug/.mtn2git_empty b/packages/base-passwd/base-passwd-3.5.9/slugos/.mtn2git_empty
similarity index 100%
rename from packages/base-passwd/base-passwd-3.5.9/openslug/.mtn2git_empty
rename to packages/base-passwd/base-passwd-3.5.9/slugos/.mtn2git_empty

diff --git a/packages/base-passwd/base-passwd-3.5.9/openslug/README b/packages/base-passwd/base-passwd-3.5.9/slugos/README
similarity index 100%
rename from packages/base-passwd/base-passwd-3.5.9/openslug/README
rename to packages/base-passwd/base-passwd-3.5.9/slugos/README

diff --git a/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch
similarity index 100%
rename from packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
rename to packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch

diff --git a/packages/bluez/files/openslug/.mtn2git_empty b/packages/bluez/files/slugos/.mtn2git_empty
similarity index 100%
rename from packages/bluez/files/openslug/.mtn2git_empty
rename to packages/bluez/files/slugos/.mtn2git_empty

diff --git a/packages/bluez/files/openslug/bluetooth.default b/packages/bluez/files/slugos/bluetooth.default
similarity index 100%
rename from packages/bluez/files/openslug/bluetooth.default
rename to packages/bluez/files/slugos/bluetooth.default

diff --git a/packages/bluez/files/openslug/hcid.conf b/packages/bluez/files/slugos/hcid.conf
similarity index 100%
rename from packages/bluez/files/openslug/hcid.conf
rename to packages/bluez/files/slugos/hcid.conf

diff --git a/packages/busybox/busybox-1.00/openslug/.mtn2git_empty b/packages/busybox/busybox-1.00/slugos/.mtn2git_empty
similarity index 100%
rename from packages/busybox/busybox-1.00/openslug/.mtn2git_empty
rename to packages/busybox/busybox-1.00/slugos/.mtn2git_empty

diff --git a/packages/busybox/busybox-1.00/openslug/defconfig b/packages/busybox/busybox-1.00/slugos/defconfig
similarity index 100%
rename from packages/busybox/busybox-1.00/openslug/defconfig
rename to packages/busybox/busybox-1.00/slugos/defconfig

diff --git a/packages/busybox/busybox-1.00/openslug/udhcpscript.patch b/packages/busybox/busybox-1.00/slugos/udhcpscript.patch
similarity index 100%
rename from packages/busybox/busybox-1.00/openslug/udhcpscript.patch
rename to packages/busybox/busybox-1.00/slugos/udhcpscript.patch

diff --git a/packages/busybox/busybox-1.01/openslug/.mtn2git_empty b/packages/busybox/busybox-1.01/slugos/.mtn2git_empty
similarity index 100%
rename from packages/busybox/busybox-1.01/openslug/.mtn2git_empty
rename to packages/busybox/busybox-1.01/slugos/.mtn2git_empty

diff --git a/packages/busybox/busybox-1.01/openslug/defconfig b/packages/busybox/busybox-1.01/slugos/defconfig
similarity index 100%
rename from packages/busybox/busybox-1.01/openslug/defconfig
rename to packages/busybox/busybox-1.01/slugos/defconfig

diff --git a/packages/busybox/busybox-1.01/openslug/udhcpscript.patch b/packages/busybox/busybox-1.01/slugos/udhcpscript.patch
similarity index 100%
rename from packages/busybox/busybox-1.01/openslug/udhcpscript.patch
rename to packages/busybox/busybox-1.01/slugos/udhcpscript.patch

diff --git a/packages/initscripts/initscripts-1.0/openslug/.mtn2git_empty b/packages/initscripts/initscripts-1.0/slugos/.mtn2git_empty
similarity index 100%
rename from packages/initscripts/initscripts-1.0/openslug/.mtn2git_empty
rename to packages/initscripts/initscripts-1.0/slugos/.mtn2git_empty

diff --git a/packages/initscripts/initscripts-1.0/openslug/alignment.sh b/packages/initscripts/initscripts-1.0/slugos/alignment.sh
similarity index 100%
rename from packages/initscripts/initscripts-1.0/openslug/alignment.sh
rename to packages/initscripts/initscripts-1.0/slugos/alignment.sh

diff --git a/packages/initscripts/initscripts-1.0/openslug/banner b/packages/initscripts/initscripts-1.0/slugos/banner
similarity index 73%
rename from packages/initscripts/initscripts-1.0/openslug/banner
rename to packages/initscripts/initscripts-1.0/slugos/banner
index d80fb19..8e64235 100644 (file)
--- a/packages/initscripts/initscripts-1.0/openslug/banner
+++ b/packages/initscripts/initscripts-1.0/slugos/banner
@@ -1,4 +1,4 @@
 #!/bin/sh
 #NOTE: this script may execute with absolutely nothing
 # in /dev
-echo "OpenSlug booting..."
+echo "SlugOS booting..."

diff --git a/packages/initscripts/initscripts-1.0/openslug/device_table.txt b/packages/initscripts/initscripts-1.0/slugos/device_table.txt
similarity index 100%
rename from packages/initscripts/initscripts-1.0/openslug/device_table.txt
rename to packages/initscripts/initscripts-1.0/slugos/device_table.txt

diff --git a/packages/initscripts/initscripts-1.0/openslug/devices.patch b/packages/initscripts/initscripts-1.0/slugos/devices.patch
similarity index 100%
rename from packages/initscripts/initscripts-1.0/openslug/devices.patch
rename to packages/initscripts/initscripts-1.0/slugos/devices.patch

diff --git a/packages/initscripts/initscripts-1.0/openslug/domainname.sh b/packages/initscripts/initscripts-1.0/slugos/domainname.sh
similarity index 100%
rename from packages/initscripts/initscripts-1.0/openslug/domainname.sh
rename to packages/initscripts/initscripts-1.0/slugos/domainname.sh

diff --git a/packages/initscripts/initscripts-1.0/openslug/rootopts.patch b/packages/initscripts/initscripts-1.0/slugos/rootopts.patch
similarity index 100%
rename from packages/initscripts/initscripts-1.0/openslug/rootopts.patch
rename to packages/initscripts/initscripts-1.0/slugos/rootopts.patch

diff --git a/packages/initscripts/initscripts-1.0/openslug/umountfs b/packages/initscripts/initscripts-1.0/slugos/umountfs
similarity index 100%
rename from packages/initscripts/initscripts-1.0/openslug/umountfs
rename to packages/initscripts/initscripts-1.0/slugos/umountfs

diff --git a/packages/initscripts/initscripts-1.0/openslug/umountnfs.sh b/packages/initscripts/initscripts-1.0/slugos/umountnfs.sh
similarity index 100%
rename from packages/initscripts/initscripts-1.0/openslug/umountnfs.sh
rename to packages/initscripts/initscripts-1.0/slugos/umountnfs.sh

diff --git a/packages/initscripts/initscripts-openslug_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb
similarity index 84%
rename from packages/initscripts/initscripts-openslug_1.0.bb
rename to packages/initscripts/initscripts-slugos_1.0.bb
index 4e82022..4ca1f8d 100644 (file)
--- a/packages/initscripts/initscripts-openslug_1.0.bb
+++ b/packages/initscripts/initscripts-slugos_1.0.bb
@@ -1,7 +1,7 @@
-# OpenSlug specific stuff for the init scripts.
+# SlugOS specific stuff for the init scripts.
 #
 # This is, in effect, an extended patch to fix various
-# problems in the initscripts on OpenSlug.  The problems
+# problems in the initscripts on SlugOS.  The problems
 # mostly come down to the order the scripts are executed
 # in.
 include initscripts_${PV}.bb
@@ -11,7 +11,7 @@ RCONFLICTS = "initscripts"
 # All other standard definitions inherited from initscripts
 # Except the PR which is hacked here.  The format used is
 # a suffix
-PR := "${PR}.3"
+PR := "${PR}.4"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
@@ -68,11 +68,11 @@ do_install_append() {
                status=0
                while read d
                do
-                       oenote "initscripts-openslug: unexpected link $f"
+                       oenote "initscripts-slugos: unexpected link $f"
                        status = 1
                done
                test $status -eq 0 ||
-                       oefatal "initscripts-openslug: new links break do_install"
+                       oefatal "initscripts-slugos: new links break do_install"
        }
 
        # Set the run-level links
@@ -86,26 +86,26 @@ do_install_append() {
        # udev runs at S 04 .
        update-rc.d -r ${D} devices             start  5 S .
        update-rc.d -r ${D} alignment.sh        start  7 S .
-       # busybox hwclock.sh (openslug-init) starts here (08)
-       # openslug-init umountinitrd runs here (09)
+       # busybox hwclock.sh (slugos-init) starts here (08)
+       # slugos-init umountinitrd runs here (09)
 
        update-rc.d -r ${D} checkroot.sh        start 10 S .
-       # openslug buffer syslog starts here (11)
+       # slugos buffer syslog starts here (11)
        # sysconfsetup runs at S 12
        # modutils.sh runs at S 20
-       # checkfs.sh is currently disabled from S 30 (and won't work on OpenSlug)
-       # ramdisk is not used on OpenSlug, would run at S 30
+       # checkfs.sh is currently disabled from S 30 (and won't work on SlugOS)
+       # ramdisk is not used on SlugOS, would run at S 30
        update-rc.d -r ${D} mountall.sh         start 35 S .
        # base-files populate-volatile.sh runs at S37
        update-rc.d -r ${D} devpts.sh           start 38 S .
-       # openslug file syslog starts here (39)
+       # slugos file syslog starts here (39)
 
        # set hostname and domainname before the network script works (by
        # entering them at level 40), networking may reset them.
        update-rc.d -r ${D} domainname.sh       start 40 S .
        update-rc.d -r ${D} hostname.sh         start 40 S .
        # network runs at S 40
-       # openslug network syslog starts here (44)
+       # slugos network syslog starts here (44)
        update-rc.d -r ${D} mountnfs.sh         start 45 S .
 
        update-rc.d -r ${D} bootmisc.sh         start 55 S .
@@ -132,20 +132,20 @@ do_install_append() {
        #
        # urandom would stop at (S)30
 
-       # This is the special, correct, openslug umountnfs.sh (it looks in
+       # This is the special, correct, slugos umountnfs.sh (it looks in
        # the /proc/mounts information, not /etc/fstab)
        update-rc.d -r ${D} umountnfs.sh        start 31 0 6 .
        # portmap stops at 32
-       # openslug network syslog stops here (39)
+       # slugos network syslog stops here (39)
        # networking stops at 40 (nothing else does, believe me.)
 
-       # busybox hwclock.sh (openslug-init) stops here (45)
-       # openslug file syslog stops here (47)
-       # openslug buffer syslog stops here (49)
+       # busybox hwclock.sh (slugos-init) stops here (45)
+       # slugos file syslog stops here (47)
+       # slugos buffer syslog stops here (49)
        # Remove any errant processes
        update-rc.d -r ${D} sendsigs            start 60 0 6 .
 
-       # This is the special, correct, openslug umountfs, it will umount
+       # This is the special, correct, slugos umountfs, it will umount
        # any network file systems which failed to umount before.
        update-rc.d -r ${D} umountfs            start 70 0 6 .
 

diff --git a/packages/meta/ludeos-image.bb b/packages/meta/ludeos-image.bb
index a939d41..669ff49 100644 (file)
--- a/packages/meta/ludeos-image.bb
+++ b/packages/meta/ludeos-image.bb
@@ -1 +1 @@
-DEPENDS = openslug-image
\ No newline at end of file
+DEPENDS = slugos-image
\ No newline at end of file

diff --git a/packages/meta/ludeos-packages.bb b/packages/meta/ludeos-packages.bb
index 1f9a186..6477c11 100644 (file)
--- a/packages/meta/ludeos-packages.bb
+++ b/packages/meta/ludeos-packages.bb
@@ -1 +1 @@
-DEPENDS = openslug-packages
+DEPENDS = slugos-packages

diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb
index 1595337..9be275c 100644 (file)
--- a/packages/meta/slugos-image.bb
+++ b/packages/meta/slugos-image.bb
@@ -4,10 +4,8 @@
 # conf/distro/slugos.conf to get the standard settings).
 #
 LICENSE = "MIT"
-PR = "r16"
+PR = "r17"
 PROVIDES += "${SLUGOS_IMAGENAME}-image"
-#FIXME: backward compatibility with the master makefile
-PROVIDES += "openslug-image"
 
 # SLUGOS_IMAGENAME defines the name of the image to be build, if it
 # is not set this package will be skipped!
@@ -109,9 +107,9 @@ SLUGOS_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole"
 # absolute minimum to have any chance of a bootable system.
 DEPENDS = "${SLUGOS_IMAGE_DEPENDS} \
        virtual/kernel base-files base-passwd \
-        busybox dropbear hotplug-ng initscripts-openslug netbase \
+        busybox dropbear hotplug-ng initscripts-slugos netbase \
         sysvinit tinylogin portmap \
-        virtual/ixp-eth openslug-init \
+        virtual/ixp-eth slugos-init \
        module-init-tools modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
        ${SLUGOS_SUPPORT} \
@@ -119,9 +117,9 @@ DEPENDS = "${SLUGOS_IMAGE_DEPENDS} \
        ${SLUGOS_NATIVE_DEPENDS}"
 
 IPKG_INSTALL = "base-files base-passwd \
-        busybox dropbear hotplug-ng initscripts-openslug netbase \
+        busybox dropbear hotplug-ng initscripts-slugos netbase \
         update-modules sysvinit tinylogin portmap \
-        ${PREFERRED_PROVIDER_virtual/ixp-eth} openslug-init \
+        ${PREFERRED_PROVIDER_virtual/ixp-eth} slugos-init \
        module-init-tools modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
        ${SLUGOS_SUPPORT} \

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 9d1be44..0680615 100644 (file)
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -4,11 +4,9 @@
 # they do not necessarily work.
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 CONFLICTS = "db3"
 PROVIDES += "${SLUGOS_IMAGENAME}-packages"
-#FIXME: backward compatibility with the master makefile
-PROVIDES += "openslug-packages"
 
 EXCLUDE_FROM_WORLD = "1"
 INHIBIT_DEFAULT_DEPS = "1"

diff --git a/packages/openslug-init/.mtn2git_empty b/packages/slugos-init/.mtn2git_empty
similarity index 100%
rename from packages/openslug-init/.mtn2git_empty
rename to packages/slugos-init/.mtn2git_empty

diff --git a/packages/openslug-init/openslug-init-0.10/.mtn2git_empty b/packages/slugos-init/files/.mtn2git_empty
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/.mtn2git_empty
rename to packages/slugos-init/files/.mtn2git_empty

diff --git a/packages/openslug-init/openslug-init-0.10/README b/packages/slugos-init/files/README
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/README
rename to packages/slugos-init/files/README

diff --git a/packages/openslug-init/openslug-init-0.10/boot/.mtn2git_empty b/packages/slugos-init/files/boot/.mtn2git_empty
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/boot/.mtn2git_empty
rename to packages/slugos-init/files/boot/.mtn2git_empty

diff --git a/packages/openslug-init/openslug-init-0.10/boot/disk b/packages/slugos-init/files/boot/disk
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/boot/disk
rename to packages/slugos-init/files/boot/disk

diff --git a/packages/openslug-init/openslug-init-0.10/boot/flash b/packages/slugos-init/files/boot/flash
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/boot/flash
rename to packages/slugos-init/files/boot/flash

diff --git a/packages/openslug-init/openslug-init-0.10/boot/network b/packages/slugos-init/files/boot/network
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/boot/network
rename to packages/slugos-init/files/boot/network

diff --git a/packages/openslug-init/openslug-init-0.10/boot/nfs b/packages/slugos-init/files/boot/nfs
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/boot/nfs
rename to packages/slugos-init/files/boot/nfs

diff --git a/packages/openslug-init/openslug-init-0.10/boot/ram b/packages/slugos-init/files/boot/ram
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/boot/ram
rename to packages/slugos-init/files/boot/ram

diff --git a/packages/openslug-init/openslug-init-0.10/boot/udhcpc.script b/packages/slugos-init/files/boot/udhcpc.script
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/boot/udhcpc.script
rename to packages/slugos-init/files/boot/udhcpc.script

diff --git a/packages/openslug-init/openslug-init-0.10/conffiles b/packages/slugos-init/files/conffiles
similarity index 94%
rename from packages/openslug-init/openslug-init-0.10/conffiles
rename to packages/slugos-init/files/conffiles
index 8e9143b..51a8091 100644 (file)
--- a/packages/openslug-init/openslug-init-0.10/conffiles
+++ b/packages/slugos-init/files/conffiles
@@ -1,5 +1,5 @@
 # conffiles
-# Known OpenSlug configuration files.  These files are preserved on
+# Known SlugOS configuration files.  These files are preserved on
 # a flash upgrade.  Other configuration files, found from:
 #
 #    /usr/lib/ipkg/*.conffiles

diff --git a/packages/openslug-init/openslug-init-0.10/functions b/packages/slugos-init/files/functions
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/functions
rename to packages/slugos-init/files/functions

diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/.mtn2git_empty b/packages/slugos-init/files/initscripts/.mtn2git_empty
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/initscripts/.mtn2git_empty
rename to packages/slugos-init/files/initscripts/.mtn2git_empty

diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/leds_startup b/packages/slugos-init/files/initscripts/leds_startup
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/initscripts/leds_startup
rename to packages/slugos-init/files/initscripts/leds_startup

diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/rmrecovery b/packages/slugos-init/files/initscripts/rmrecovery
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/initscripts/rmrecovery
rename to packages/slugos-init/files/initscripts/rmrecovery

diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup b/packages/slugos-init/files/initscripts/sysconfsetup
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup
rename to packages/slugos-init/files/initscripts/sysconfsetup

diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/syslog.buffer b/packages/slugos-init/files/initscripts/syslog.buffer
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/initscripts/syslog.buffer
rename to packages/slugos-init/files/initscripts/syslog.buffer

diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/syslog.file b/packages/slugos-init/files/initscripts/syslog.file
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/initscripts/syslog.file
rename to packages/slugos-init/files/initscripts/syslog.file

diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/syslog.network b/packages/slugos-init/files/initscripts/syslog.network
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/initscripts/syslog.network
rename to packages/slugos-init/files/initscripts/syslog.network

diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh b/packages/slugos-init/files/initscripts/umountinitrd.sh
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh
rename to packages/slugos-init/files/initscripts/umountinitrd.sh

diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/zleds b/packages/slugos-init/files/initscripts/zleds
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/initscripts/zleds
rename to packages/slugos-init/files/initscripts/zleds

diff --git a/packages/openslug-init/openslug-init-0.10/kern_header.c b/packages/slugos-init/files/kern_header.c
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/kern_header.c
rename to packages/slugos-init/files/kern_header.c

diff --git a/packages/openslug-init/openslug-init-0.10/leds.c b/packages/slugos-init/files/leds.c
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/leds.c
rename to packages/slugos-init/files/leds.c

diff --git a/packages/openslug-init/openslug-init-0.10/leds.h b/packages/slugos-init/files/leds.h
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/leds.h
rename to packages/slugos-init/files/leds.h

diff --git a/packages/openslug-init/openslug-init-0.10/links.conf b/packages/slugos-init/files/links.conf
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/links.conf
rename to packages/slugos-init/files/links.conf

diff --git a/packages/openslug-init/openslug-init-0.10/linuxrc b/packages/slugos-init/files/linuxrc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/linuxrc
rename to packages/slugos-init/files/linuxrc

diff --git a/packages/openslug-init/openslug-init-0.10/modprobe.conf b/packages/slugos-init/files/modprobe.conf
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/modprobe.conf
rename to packages/slugos-init/files/modprobe.conf

diff --git a/packages/openslug-init/openslug-init-0.10/modutils.txt b/packages/slugos-init/files/modutils.txt
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/modutils.txt
rename to packages/slugos-init/files/modutils.txt

diff --git a/packages/openslug-init/openslug-init-0.10/reflash b/packages/slugos-init/files/reflash
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/reflash
rename to packages/slugos-init/files/reflash

diff --git a/packages/openslug-init/openslug-init-0.10/turnup b/packages/slugos-init/files/turnup
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/turnup
rename to packages/slugos-init/files/turnup

diff --git a/packages/openslug-init/openslug-init-0.10/update-kernel b/packages/slugos-init/files/update-kernel
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from packages/openslug-init/openslug-init-0.10/update-kernel
rename to packages/slugos-init/files/update-kernel

diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
similarity index 96%
rename from packages/openslug-init/openslug-init_0.10.bb
rename to packages/slugos-init/slugos-init_0.10.bb
index a54e45e..4719b9d 100644 (file)
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = "Openslug initial network config via sysconf"
+DESCRIPTION = "SlugOS initial network config via sysconf"
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r45"
+PR = "r46"
 
 SRC_URI = "file://linuxrc \
           file://boot/flash \
@@ -119,7 +119,7 @@ do_install() {
 #NB: do not use '08' (etc) for the first argument after start/stop,
 # the value is interpreted as an octal number if there is a leading
 # zero.
-pkg_postinst_openslug-init() {
+pkg_postinst_slugos-init() {
        opt=
        test -n "$D" && opt="-r $D"
        update-rc.d $opt hwclock.sh             start  8 S . start 45 0 6 .
@@ -134,7 +134,7 @@ pkg_postinst_openslug-init() {
        update-rc.d $opt leds_startup           start  1 1 2 3 4 5 .
 }
 
-pkg_postrm_openslug-init() {
+pkg_postrm_slugos-init() {
        opt=
        test -n "$D" && opt="-r $D"
        for s in ${INITSCRIPTS}

diff --git a/packages/sysvinit/sysvinit/openslug/.mtn2git_empty b/packages/sysvinit/sysvinit/slugos/.mtn2git_empty
similarity index 100%
rename from packages/sysvinit/sysvinit/openslug/.mtn2git_empty
rename to packages/sysvinit/sysvinit/slugos/.mtn2git_empty

diff --git a/packages/sysvinit/sysvinit/openslug/inittab b/packages/sysvinit/sysvinit/slugos/inittab
similarity index 100%
rename from packages/sysvinit/sysvinit/openslug/inittab
rename to packages/sysvinit/sysvinit/slugos/inittab