diff options
author | Rod Whitby <rod@whitby.id.au> | 2006-01-07 08:58:44 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-07 08:58:44 +0000 |
commit | 8fb6b2d3d410ad2badf0c99ed7a66b698aafaa17 (patch) | |
tree | 8a700d795bdf33061b8bccc353fe0aaffa044036 /packages | |
parent | 0b67482ddc4fe571d16fa094627abb447b9a8edb (diff) |
slugos: Major rename of common SlugOS files and directories from openslug to slugos.
Diffstat (limited to 'packages')
-rw-r--r-- | packages/base-files/base-files/slugos/.mtn2git_empty (renamed from packages/base-files/base-files/openslug/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/base-files/base-files/slugos/fstab (renamed from packages/base-files/base-files/openslug/fstab) | 0 | ||||
-rw-r--r-- | packages/base-passwd/base-passwd-3.5.9/slugos/.mtn2git_empty (renamed from packages/base-passwd/base-passwd-3.5.9/openslug/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/base-passwd/base-passwd-3.5.9/slugos/README (renamed from packages/base-passwd/base-passwd-3.5.9/openslug/README) | 0 | ||||
-rw-r--r-- | packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch (renamed from packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch) | 0 | ||||
-rw-r--r-- | packages/bluez/files/slugos/.mtn2git_empty (renamed from packages/bluez/files/openslug/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/bluez/files/slugos/bluetooth.default (renamed from packages/bluez/files/openslug/bluetooth.default) | 0 | ||||
-rw-r--r-- | packages/bluez/files/slugos/hcid.conf (renamed from packages/bluez/files/openslug/hcid.conf) | 0 | ||||
-rw-r--r-- | packages/busybox/busybox-1.00/slugos/.mtn2git_empty (renamed from packages/busybox/busybox-1.00/openslug/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/busybox/busybox-1.00/slugos/defconfig (renamed from packages/busybox/busybox-1.00/openslug/defconfig) | 0 | ||||
-rw-r--r-- | packages/busybox/busybox-1.00/slugos/udhcpscript.patch (renamed from packages/busybox/busybox-1.00/openslug/udhcpscript.patch) | 0 | ||||
-rw-r--r-- | packages/busybox/busybox-1.01/slugos/.mtn2git_empty (renamed from packages/busybox/busybox-1.01/openslug/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/busybox/busybox-1.01/slugos/defconfig (renamed from packages/busybox/busybox-1.01/openslug/defconfig) | 0 | ||||
-rw-r--r-- | packages/busybox/busybox-1.01/slugos/udhcpscript.patch (renamed from packages/busybox/busybox-1.01/openslug/udhcpscript.patch) | 0 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/.mtn2git_empty (renamed from packages/initscripts/initscripts-1.0/openslug/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/alignment.sh (renamed from packages/initscripts/initscripts-1.0/openslug/alignment.sh) | 0 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/banner (renamed from packages/initscripts/initscripts-1.0/openslug/banner) | 2 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/device_table.txt (renamed from packages/initscripts/initscripts-1.0/openslug/device_table.txt) | 0 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/devices.patch (renamed from packages/initscripts/initscripts-1.0/openslug/devices.patch) | 0 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/domainname.sh (renamed from packages/initscripts/initscripts-1.0/openslug/domainname.sh) | 0 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/rootopts.patch (renamed from packages/initscripts/initscripts-1.0/openslug/rootopts.patch) | 0 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/umountfs (renamed from packages/initscripts/initscripts-1.0/openslug/umountfs) | 0 | ||||
-rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/umountnfs.sh (renamed from packages/initscripts/initscripts-1.0/openslug/umountnfs.sh) | 0 | ||||
-rw-r--r-- | packages/initscripts/initscripts-slugos_1.0.bb (renamed from packages/initscripts/initscripts-openslug_1.0.bb) | 36 | ||||
-rw-r--r-- | packages/meta/ludeos-image.bb | 2 | ||||
-rw-r--r-- | packages/meta/ludeos-packages.bb | 2 | ||||
-rw-r--r-- | packages/meta/slugos-image.bb | 12 | ||||
-rw-r--r-- | packages/meta/slugos-packages.bb | 4 | ||||
-rw-r--r-- | packages/slugos-init/.mtn2git_empty (renamed from packages/openslug-init/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/.mtn2git_empty (renamed from packages/openslug-init/openslug-init-0.10/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/README (renamed from packages/openslug-init/openslug-init-0.10/README) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/boot/.mtn2git_empty (renamed from packages/openslug-init/openslug-init-0.10/boot/.mtn2git_empty) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | packages/slugos-init/files/boot/disk (renamed from packages/openslug-init/openslug-init-0.10/boot/disk) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | packages/slugos-init/files/boot/flash (renamed from packages/openslug-init/openslug-init-0.10/boot/flash) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | packages/slugos-init/files/boot/network (renamed from packages/openslug-init/openslug-init-0.10/boot/network) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | packages/slugos-init/files/boot/nfs (renamed from packages/openslug-init/openslug-init-0.10/boot/nfs) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | packages/slugos-init/files/boot/ram (renamed from packages/openslug-init/openslug-init-0.10/boot/ram) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | packages/slugos-init/files/boot/udhcpc.script (renamed from packages/openslug-init/openslug-init-0.10/boot/udhcpc.script) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/conffiles (renamed from packages/openslug-init/openslug-init-0.10/conffiles) | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | packages/slugos-init/files/functions (renamed from packages/openslug-init/openslug-init-0.10/functions) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/initscripts/.mtn2git_empty (renamed from packages/openslug-init/openslug-init-0.10/initscripts/.mtn2git_empty) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | packages/slugos-init/files/initscripts/leds_startup (renamed from packages/openslug-init/openslug-init-0.10/initscripts/leds_startup) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | packages/slugos-init/files/initscripts/rmrecovery (renamed from packages/openslug-init/openslug-init-0.10/initscripts/rmrecovery) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/initscripts/sysconfsetup (renamed from packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/initscripts/syslog.buffer (renamed from packages/openslug-init/openslug-init-0.10/initscripts/syslog.buffer) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/initscripts/syslog.file (renamed from packages/openslug-init/openslug-init-0.10/initscripts/syslog.file) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/initscripts/syslog.network (renamed from packages/openslug-init/openslug-init-0.10/initscripts/syslog.network) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/initscripts/umountinitrd.sh (renamed from packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/initscripts/zleds (renamed from packages/openslug-init/openslug-init-0.10/initscripts/zleds) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/kern_header.c (renamed from packages/openslug-init/openslug-init-0.10/kern_header.c) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/leds.c (renamed from packages/openslug-init/openslug-init-0.10/leds.c) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/leds.h (renamed from packages/openslug-init/openslug-init-0.10/leds.h) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/links.conf (renamed from packages/openslug-init/openslug-init-0.10/links.conf) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | packages/slugos-init/files/linuxrc (renamed from packages/openslug-init/openslug-init-0.10/linuxrc) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/modprobe.conf (renamed from packages/openslug-init/openslug-init-0.10/modprobe.conf) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/modutils.txt (renamed from packages/openslug-init/openslug-init-0.10/modutils.txt) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/reflash (renamed from packages/openslug-init/openslug-init-0.10/reflash) | 0 | ||||
-rw-r--r-- | packages/slugos-init/files/turnup (renamed from packages/openslug-init/openslug-init-0.10/turnup) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | packages/slugos-init/files/update-kernel (renamed from packages/openslug-init/openslug-init-0.10/update-kernel) | 0 | ||||
-rw-r--r-- | packages/slugos-init/slugos-init_0.10.bb (renamed from packages/openslug-init/openslug-init_0.10.bb) | 8 | ||||
-rw-r--r-- | packages/sysvinit/sysvinit/slugos/.mtn2git_empty (renamed from packages/sysvinit/sysvinit/openslug/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/sysvinit/sysvinit/slugos/inittab (renamed from packages/sysvinit/sysvinit/openslug/inittab) | 0 |
62 files changed, 32 insertions, 36 deletions
diff --git a/packages/base-files/base-files/openslug/.mtn2git_empty b/packages/base-files/base-files/slugos/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/base-files/base-files/openslug/.mtn2git_empty +++ b/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 index 0ac6b1460c..0ac6b1460c 100644 --- a/packages/base-files/base-files/openslug/fstab +++ b/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 index e69de29bb2..e69de29bb2 100644 --- a/packages/base-passwd/base-passwd-3.5.9/openslug/.mtn2git_empty +++ b/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 index 05c2e419f5..05c2e419f5 100644 --- a/packages/base-passwd/base-passwd-3.5.9/openslug/README +++ b/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 index 97dab68f33..97dab68f33 100644 --- 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 diff --git a/packages/bluez/files/openslug/.mtn2git_empty b/packages/bluez/files/slugos/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/bluez/files/openslug/.mtn2git_empty +++ b/packages/bluez/files/slugos/.mtn2git_empty diff --git a/packages/bluez/files/openslug/bluetooth.default b/packages/bluez/files/slugos/bluetooth.default index 10f628e314..10f628e314 100644 --- a/packages/bluez/files/openslug/bluetooth.default +++ b/packages/bluez/files/slugos/bluetooth.default diff --git a/packages/bluez/files/openslug/hcid.conf b/packages/bluez/files/slugos/hcid.conf index 46a5d5fd54..46a5d5fd54 100644 --- a/packages/bluez/files/openslug/hcid.conf +++ b/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 index e69de29bb2..e69de29bb2 100644 --- a/packages/busybox/busybox-1.00/openslug/.mtn2git_empty +++ b/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 index 7debaeced2..7debaeced2 100644 --- a/packages/busybox/busybox-1.00/openslug/defconfig +++ b/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 index 010f64a53f..010f64a53f 100644 --- a/packages/busybox/busybox-1.00/openslug/udhcpscript.patch +++ b/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 index e69de29bb2..e69de29bb2 100644 --- a/packages/busybox/busybox-1.01/openslug/.mtn2git_empty +++ b/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 index 7debaeced2..7debaeced2 100644 --- a/packages/busybox/busybox-1.01/openslug/defconfig +++ b/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 index 010f64a53f..010f64a53f 100644 --- a/packages/busybox/busybox-1.01/openslug/udhcpscript.patch +++ b/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 index e69de29bb2..e69de29bb2 100644 --- a/packages/initscripts/initscripts-1.0/openslug/.mtn2git_empty +++ b/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 index bf193cb01c..bf193cb01c 100644 --- a/packages/initscripts/initscripts-1.0/openslug/alignment.sh +++ b/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 index d80fb19fe4..8e64235acb 100644 --- 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 index ae3cb79913..ae3cb79913 100644 --- a/packages/initscripts/initscripts-1.0/openslug/device_table.txt +++ b/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 index 26b1841d5b..26b1841d5b 100644 --- a/packages/initscripts/initscripts-1.0/openslug/devices.patch +++ b/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 index 7113467d8c..7113467d8c 100644 --- a/packages/initscripts/initscripts-1.0/openslug/domainname.sh +++ b/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 index 3f2a925879..3f2a925879 100644 --- a/packages/initscripts/initscripts-1.0/openslug/rootopts.patch +++ b/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 index d6f432dbda..d6f432dbda 100644 --- a/packages/initscripts/initscripts-1.0/openslug/umountfs +++ b/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 index 994a919225..994a919225 100644 --- a/packages/initscripts/initscripts-1.0/openslug/umountnfs.sh +++ b/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 index 4e82022876..4ca1f8d36c 100644 --- 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 a939d41531..669ff49634 100644 --- 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 1f9a1865a2..6477c11e4c 100644 --- 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 1595337981..9be275c862 100644 --- 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 9d1be446e9..0680615cca 100644 --- 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 index e69de29bb2..e69de29bb2 100644 --- a/packages/openslug-init/.mtn2git_empty +++ b/packages/slugos-init/.mtn2git_empty diff --git a/packages/openslug-init/openslug-init-0.10/.mtn2git_empty b/packages/slugos-init/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/openslug-init/openslug-init-0.10/.mtn2git_empty +++ b/packages/slugos-init/files/.mtn2git_empty diff --git a/packages/openslug-init/openslug-init-0.10/README b/packages/slugos-init/files/README index 264d4d8f85..264d4d8f85 100644 --- a/packages/openslug-init/openslug-init-0.10/README +++ b/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 index e69de29bb2..e69de29bb2 100644 --- a/packages/openslug-init/openslug-init-0.10/boot/.mtn2git_empty +++ b/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 index ede33a3ee6..ede33a3ee6 100755..100644 --- a/packages/openslug-init/openslug-init-0.10/boot/disk +++ b/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 index e0bcebc9b8..e0bcebc9b8 100755..100644 --- a/packages/openslug-init/openslug-init-0.10/boot/flash +++ b/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 index 02b226d1f3..02b226d1f3 100755..100644 --- a/packages/openslug-init/openslug-init-0.10/boot/network +++ b/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 index 534d8b7cb0..534d8b7cb0 100755..100644 --- a/packages/openslug-init/openslug-init-0.10/boot/nfs +++ b/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 index 66d46a7089..66d46a7089 100755..100644 --- a/packages/openslug-init/openslug-init-0.10/boot/ram +++ b/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 index 3f437e3143..3f437e3143 100755..100644 --- a/packages/openslug-init/openslug-init-0.10/boot/udhcpc.script +++ b/packages/slugos-init/files/boot/udhcpc.script diff --git a/packages/openslug-init/openslug-init-0.10/conffiles b/packages/slugos-init/files/conffiles index 8e9143bf75..51a8091b1e 100644 --- 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 index e90f03aead..e90f03aead 100755..100644 --- a/packages/openslug-init/openslug-init-0.10/functions +++ b/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 index e69de29bb2..e69de29bb2 100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/.mtn2git_empty +++ b/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 index 945d75bd02..945d75bd02 100755..100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/leds_startup +++ b/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 index eec822b154..eec822b154 100755..100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/rmrecovery +++ b/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 index 31ff38d7ee..31ff38d7ee 100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/sysconfsetup +++ b/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 index 9285c02946..9285c02946 100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/syslog.buffer +++ b/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 index 80ee5f0174..80ee5f0174 100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/syslog.file +++ b/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 index 3d7f4ab8e6..3d7f4ab8e6 100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/syslog.network +++ b/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 index da39b425f8..da39b425f8 100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh +++ b/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 index c4e2b37219..c4e2b37219 100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/zleds +++ b/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 index 73b46eec0c..73b46eec0c 100644 --- a/packages/openslug-init/openslug-init-0.10/kern_header.c +++ b/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 index e2120ae5d6..e2120ae5d6 100644 --- a/packages/openslug-init/openslug-init-0.10/leds.c +++ b/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 index 0b236dd6c0..0b236dd6c0 100644 --- a/packages/openslug-init/openslug-init-0.10/leds.h +++ b/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 index fdd1f3ce23..fdd1f3ce23 100644 --- a/packages/openslug-init/openslug-init-0.10/links.conf +++ b/packages/slugos-init/files/links.conf diff --git a/packages/openslug-init/openslug-init-0.10/linuxrc b/packages/slugos-init/files/linuxrc index 7c20a55b65..7c20a55b65 100755..100644 --- a/packages/openslug-init/openslug-init-0.10/linuxrc +++ b/packages/slugos-init/files/linuxrc diff --git a/packages/openslug-init/openslug-init-0.10/modprobe.conf b/packages/slugos-init/files/modprobe.conf index 08482e8c6d..08482e8c6d 100644 --- a/packages/openslug-init/openslug-init-0.10/modprobe.conf +++ b/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 index a73b480efe..a73b480efe 100644 --- a/packages/openslug-init/openslug-init-0.10/modutils.txt +++ b/packages/slugos-init/files/modutils.txt diff --git a/packages/openslug-init/openslug-init-0.10/reflash b/packages/slugos-init/files/reflash index bcf51fc606..bcf51fc606 100644 --- a/packages/openslug-init/openslug-init-0.10/reflash +++ b/packages/slugos-init/files/reflash diff --git a/packages/openslug-init/openslug-init-0.10/turnup b/packages/slugos-init/files/turnup index 0029697c50..0029697c50 100644 --- a/packages/openslug-init/openslug-init-0.10/turnup +++ b/packages/slugos-init/files/turnup diff --git a/packages/openslug-init/openslug-init-0.10/update-kernel b/packages/slugos-init/files/update-kernel index 796d45e953..796d45e953 100755..100644 --- a/packages/openslug-init/openslug-init-0.10/update-kernel +++ b/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 index a54e45ed3d..4719b9dcca 100644 --- 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 index e69de29bb2..e69de29bb2 100644 --- a/packages/sysvinit/sysvinit/openslug/.mtn2git_empty +++ b/packages/sysvinit/sysvinit/slugos/.mtn2git_empty diff --git a/packages/sysvinit/sysvinit/openslug/inittab b/packages/sysvinit/sysvinit/slugos/inittab index a82c1f5449..a82c1f5449 100644 --- a/packages/sysvinit/sysvinit/openslug/inittab +++ b/packages/sysvinit/sysvinit/slugos/inittab |