summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOyvind Repvik <nail@nslu2-linux.org>2007-03-10 00:39:09 +0000
committerOyvind Repvik <nail@nslu2-linux.org>2007-03-10 00:39:09 +0000
commit1d79a159550d59d7bbf64a1f04e9acfc1c20efda (patch)
tree15235953664171c9943cea4894cda0c4d55e46cf
parent02294a0fbba2831be38732b5368a7b3652105f0e (diff)
openturbostation: Remove leftover cruft
-rw-r--r--packages/busybox/busybox-1.2.1/foonas/.mtn2git_empty (renamed from packages/busybox/busybox-1.2.1/openturbostation/.mtn2git_empty)0
-rw-r--r--packages/busybox/busybox-1.2.1/foonas/defconfig (renamed from packages/busybox/busybox-1.2.1/openturbostation/defconfig)0
-rw-r--r--packages/initscripts/initscripts-1.0/foonas/.mtn2git_empty (renamed from packages/initscripts/initscripts-1.0/openturbostation/.mtn2git_empty)0
-rwxr-xr-xpackages/initscripts/initscripts-1.0/foonas/checkroot.sh (renamed from packages/initscripts/initscripts-1.0/openturbostation/checkroot.sh)0
-rwxr-xr-xpackages/initscripts/initscripts-1.0/foonas/devices (renamed from packages/initscripts/initscripts-1.0/openturbostation/devices)0
-rw-r--r--packages/initscripts/initscripts-1.0/foonas/domainname.sh (renamed from packages/initscripts/initscripts-1.0/openturbostation/domainname.sh)0
-rwxr-xr-xpackages/initscripts/initscripts-1.0/foonas/halt (renamed from packages/initscripts/initscripts-1.0/openturbostation/halt)0
-rwxr-xr-xpackages/initscripts/initscripts-1.0/foonas/reboot (renamed from packages/initscripts/initscripts-1.0/openturbostation/reboot)0
-rw-r--r--packages/initscripts/initscripts-openturbostation_1.0.bb174
-rw-r--r--packages/netbase/netbase/foonas/.mtn2git_empty (renamed from packages/netbase/netbase/openturbostation/.mtn2git_empty)0
-rw-r--r--packages/netbase/netbase/foonas/interfaces (renamed from packages/netbase/netbase/openturbostation/interfaces)0
11 files changed, 0 insertions, 174 deletions
diff --git a/packages/busybox/busybox-1.2.1/openturbostation/.mtn2git_empty b/packages/busybox/busybox-1.2.1/foonas/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/busybox/busybox-1.2.1/openturbostation/.mtn2git_empty
+++ b/packages/busybox/busybox-1.2.1/foonas/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.2.1/openturbostation/defconfig b/packages/busybox/busybox-1.2.1/foonas/defconfig
index 322ccd7740..322ccd7740 100644
--- a/packages/busybox/busybox-1.2.1/openturbostation/defconfig
+++ b/packages/busybox/busybox-1.2.1/foonas/defconfig
diff --git a/packages/initscripts/initscripts-1.0/openturbostation/.mtn2git_empty b/packages/initscripts/initscripts-1.0/foonas/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/initscripts/initscripts-1.0/openturbostation/.mtn2git_empty
+++ b/packages/initscripts/initscripts-1.0/foonas/.mtn2git_empty
diff --git a/packages/initscripts/initscripts-1.0/openturbostation/checkroot.sh b/packages/initscripts/initscripts-1.0/foonas/checkroot.sh
index c69a773482..c69a773482 100755
--- a/packages/initscripts/initscripts-1.0/openturbostation/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/foonas/checkroot.sh
diff --git a/packages/initscripts/initscripts-1.0/openturbostation/devices b/packages/initscripts/initscripts-1.0/foonas/devices
index f83ea63598..f83ea63598 100755
--- a/packages/initscripts/initscripts-1.0/openturbostation/devices
+++ b/packages/initscripts/initscripts-1.0/foonas/devices
diff --git a/packages/initscripts/initscripts-1.0/openturbostation/domainname.sh b/packages/initscripts/initscripts-1.0/foonas/domainname.sh
index 7113467d8c..7113467d8c 100644
--- a/packages/initscripts/initscripts-1.0/openturbostation/domainname.sh
+++ b/packages/initscripts/initscripts-1.0/foonas/domainname.sh
diff --git a/packages/initscripts/initscripts-1.0/openturbostation/halt b/packages/initscripts/initscripts-1.0/foonas/halt
index f22d892d46..f22d892d46 100755
--- a/packages/initscripts/initscripts-1.0/openturbostation/halt
+++ b/packages/initscripts/initscripts-1.0/foonas/halt
diff --git a/packages/initscripts/initscripts-1.0/openturbostation/reboot b/packages/initscripts/initscripts-1.0/foonas/reboot
index 05a82be4c0..05a82be4c0 100755
--- a/packages/initscripts/initscripts-1.0/openturbostation/reboot
+++ b/packages/initscripts/initscripts-1.0/foonas/reboot
diff --git a/packages/initscripts/initscripts-openturbostation_1.0.bb b/packages/initscripts/initscripts-openturbostation_1.0.bb
deleted file mode 100644
index 68e291f566..0000000000
--- a/packages/initscripts/initscripts-openturbostation_1.0.bb
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-# OpenTurbostation stuff sorta specific for the turbostation
-#
-# This is, in effect, an extended patch to fix various
-# problems in the initscripts on SlugOS. The problems
-# mostly come down to the order the scripts are executed
-# in.
-include initscripts_${PV}.bb
-
-RCONFLICTS = "initscripts"
-# All other standard definitions inherited from initscripts
-# Except the PR which is hacked here. The format used is
-# a suffix
-PR := "${PR}.11"
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-PACKAGES = "${PN}"
-
-SRC_URI += "file://openturbostation/domainname.sh"
-SRC_URI += "file://openturbostation/devices"
-SRC_URI += "file://openturbostation/halt"
-SRC_URI += "file://openturbostation/reboot"
-SRC_URI += "file://openturbostation/checkroot.sh"
-
-# Without this it is not possible to patch checkroot.sh
-S = "${WORKDIR}"
-
-do_install_append() {
- # the image build command now installs this for slugos
- # except that mine doesn't. we don't need it, but we turnup
- # expects it to at least exist
- rm ${D}${sysconfdir}/device_table
- touch ${D}${sysconfdir}/device_table
-
- # openprotium specific scripts
- # install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openturbostation/domainname.sh ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openturbostation/halt ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openturbostation/reboot ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openturbostation/devices ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/openturbostation/checkroot.sh ${D}${sysconfdir}/init.d
-
- # Remove the do install links (this detects a change to the
- # initscripts .bb file - it will cause a build failure here.)
- # This is a copy of the ln -sf lines from the initscripts
- # do_install.
- rm ${D}${sysconfdir}/rc2.d/S99rmnologin
- rm ${D}${sysconfdir}/rc3.d/S99rmnologin
- rm ${D}${sysconfdir}/rc4.d/S99rmnologin
- rm ${D}${sysconfdir}/rc5.d/S99rmnologin
- rm ${D}${sysconfdir}/rc6.d/S20sendsigs
-# rm ${D}${sysconfdir}/rc6.d/S30urandom
- rm ${D}${sysconfdir}/rc6.d/S31umountnfs.sh
- rm ${D}${sysconfdir}/rc6.d/S40umountfs
- rm ${D}${sysconfdir}/rcS.d/S30ramdisk
- rm ${D}${sysconfdir}/rc6.d/S90reboot
- rm ${D}${sysconfdir}/rc0.d/S20sendsigs
-# rm ${D}${sysconfdir}/rc0.d/S30urandom
- rm ${D}${sysconfdir}/rc0.d/S31umountnfs.sh
- rm ${D}${sysconfdir}/rc0.d/S40umountfs
- rm ${D}${sysconfdir}/rc0.d/S90halt
- rm ${D}${sysconfdir}/rcS.d/S02banner
- rm ${D}${sysconfdir}/rcS.d/S10checkroot.sh
-# rm ${D}${sysconfdir}/rcS.d/S30checkfs.sh
- rm ${D}${sysconfdir}/rcS.d/S35mountall.sh
- rm ${D}${sysconfdir}/rcS.d/S39hostname.sh
- rm ${D}${sysconfdir}/rcS.d/S45mountnfs.sh
- rm ${D}${sysconfdir}/rcS.d/S55bootmisc.sh
-# rm ${D}${sysconfdir}/rcS.d/S55urandom
- rm ${D}${sysconfdir}/rcS.d/S99finish
- rm ${D}${sysconfdir}/rcS.d/S05devices
- # udev will run at S04 if installed
- rm ${D}${sysconfdir}/rcS.d/S03sysfs
- rm ${D}${sysconfdir}/rcS.d/S38devpts.sh
- rm -f ${D}${sysconfdir}/rcS.d/S06alignment
- rm ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
- rm ${D}${sysconfdir}/rc0.d/S25save-rtc.sh
- rm ${D}${sysconfdir}/rc6.d/S25save-rtc.sh
-
-
-
- # Check the result
- find ${D}${sysconfdir}/rc?.d ! -type d -print | {
- status=0
- while read d
- do
- oenote "initscripts-openturbostation: unexpected link $d"
- status=1
- done
- test $status -eq 0 ||
- oefatal "initscripts-openturbostation: new links break do_install"
- }
-
- # Set the run-level links
- #
- # Startup (S) links - UNCHANGED
- #
- # Keep these in order of startup - S, then 1, 2-5, 0,6
- # according to the level in which the script starts (or stops) first.
- update-rc.d -r ${D} banner start 2 S .
- update-rc.d -r ${D} sysfs.sh start 3 S .
- # 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 (slugos-init) starts here (08)
- # slugos-init umountinitrd runs here (09)
-
- update-rc.d -r ${D} checkroot.sh start 10 S .
- # 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 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 .
- # slugos file syslog starts here (39)
- update-rc.d -r ${D} populate-volatile.sh start 37 S .
-
- # 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
- # 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 .
- # urandom is currently disabled from S 55 (and won't work with tmpfs /var)
-
- # ipkg-cl configure runs at S 98
- update-rc.d -r ${D} finish start 99 S .
-
- #
- # User (2-5) links - UNCHANGED
- # rmnologin is the only thing added to user levels
- update-rc.d -r ${D} rmnologin start 99 2 3 4 5 .
-
- #
- # Shutdown (0,6) links - !!!CHANGED!!!
- #
- # The problem here is that netbase installs K40networking but portmap
- # installs S32portmap. One of these has to change! The safe change
- # is to make the networking stop at S40, so all network related shutdown
- # must be in a K script or <S40.
- #
- # S20sendsigs is a disaster. It needs to happen before the umounts
- # but after the portmapper (which it would otherwise kill).
- #
- # urandom would stop at (S)30
-
- # 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 .
- update-rc.d -r ${D} save-rtc.sh start 25 0 6 .
- # portmap stops at 32
- # slugos network syslog stops here (39)
- # networking stops at 40 (nothing else does, believe me.)
-
- # busybox hwclock.sh (slugos-init) stops here (45)
- # slugos file syslog stops here (47)
- # slugos buffer syslog stops here (49)
- # udev stops here (55)
- # Remove any errant processes
- update-rc.d -r ${D} sendsigs start 60 0 6 .
-
- # 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 .
-
- update-rc.d -r ${D} halt start 90 0 .
- update-rc.d -r ${D} reboot start 90 6 .
-}
diff --git a/packages/netbase/netbase/openturbostation/.mtn2git_empty b/packages/netbase/netbase/foonas/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/netbase/netbase/openturbostation/.mtn2git_empty
+++ b/packages/netbase/netbase/foonas/.mtn2git_empty
diff --git a/packages/netbase/netbase/openturbostation/interfaces b/packages/netbase/netbase/foonas/interfaces
index 314715bba7..314715bba7 100644
--- a/packages/netbase/netbase/openturbostation/interfaces
+++ b/packages/netbase/netbase/foonas/interfaces