consolidate collie, shepherd, husky into the common machine c7x0. kernel 2.6 handles all three machines, for kernel 2.4 we build three different kernels for every -image build.

BKrev: 42107bc9qhsZjYvjPqkddsMIsQuYAA

7 files changed, 5 insertions, 196 deletions

diff --git a/packages/initscripts/initscripts-1.0/corgi/keymap b/packages/initscripts/initscripts-1.0/c7x0/devices
index e69de29bb2..e69de29bb2 100644
--- a/packages/initscripts/initscripts-1.0/corgi/keymap
+++ b/packages/initscripts/initscripts-1.0/c7x0/devices
diff --git a/packages/initscripts/initscripts-1.0/husky/keymap b/packages/initscripts/initscripts-1.0/c7x0/keymap
index e69de29bb2..e69de29bb2 100644
--- a/packages/initscripts/initscripts-1.0/husky/keymap
+++ b/packages/initscripts/initscripts-1.0/c7x0/keymap
diff --git a/packages/initscripts/initscripts-1.0/corgi/devices b/packages/initscripts/initscripts-1.0/corgi/devices
deleted file mode 100644
index b3a3323b8a..0000000000
--- a/packages/initscripts/initscripts-1.0/corgi/devices
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# Devfs handling script.  Since we arent running devfsd due to various reasons
-# which I will not lay out here, we need to create some links for compatibility.
-
-. /etc/default/rcS
-
-if test -e /dev/.devfsd
-then
-	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
-	ln -s /dev/touchscreen/0 /dev/ts
-	ln -s /dev/touchscreen/0raw /dev/tsraw
-	ln -s /dev/vc/0 /dev/tty0
-	ln -s /dev/vc/1 /dev/tty1
-	ln -s /dev/vc/2 /dev/tty2
-	ln -s /dev/vc/3 /dev/tty3
-	ln -s /dev/vc/4 /dev/tty4
-	ln -s /dev/vc/5 /dev/tty5
-	ln -s /dev/fb/0 /dev/fb0
-#	ln -s /dev/tts/0 /dev/ttySA0
-#	ln -s /dev/tts/1 /dev/ttySA1
-#	ln -s /dev/tts/2 /dev/ttySA2
-
-	ln -s /dev/sound/dsp /dev/dsp
-	ln -s /dev/sound/mixer /dev/mixer
-
-	ln -s /dev/v4l/video0 /dev/video0
-	ln -s /dev/v4l/video0 /dev/video
-	ln -s /dev/misc/rtc /dev/rtc
-
-	## need this so that ppp will autoload the ppp modules
-	mknod /dev/ppp c 108 0
-	if test "$VERBOSE" != "no"; then echo "done"; fi
-else
-	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
-	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
-	if test $? -ne 0; then
-		if test "$VERBOSE" != "no"; then echo "failed"; fi
-	else
-		if test "$VERBOSE" != "no"; then echo "done"; fi
-	fi
-	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
-	cd /
-	mkdir -p dev/msys
-	mkdir -p dev/pts
-	mkdir -p dev/input
-	mkdir -p dev/vc
-	for i in 0 1 2 3 4 5 6 7 8 9; do
-		ln -s /dev/tty$i /dev/vc/$i
-	done
-	ln -sf /dev/sharp_ts /dev/ts
-        ln -sf /dev/sharp_fl /dev/fl
-	ln -sf /proc/self/fd /dev/fd
-	ln -sf /proc/kcore /dev/core
-	/sbin/makedevs -r / -D /etc/device_table
-	if test $? -ne 0; then
-		if test "$VERBOSE" != "no"; then echo "failed"; fi
-	else
-		if test "$VERBOSE" != "no"; then echo "done"; fi
-	fi
-fi
-
-exit 0
diff --git a/packages/initscripts/initscripts-1.0/husky/devices b/packages/initscripts/initscripts-1.0/husky/devices
deleted file mode 100644
index b3a3323b8a..0000000000
--- a/packages/initscripts/initscripts-1.0/husky/devices
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# Devfs handling script.  Since we arent running devfsd due to various reasons
-# which I will not lay out here, we need to create some links for compatibility.
-
-. /etc/default/rcS
-
-if test -e /dev/.devfsd
-then
-	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
-	ln -s /dev/touchscreen/0 /dev/ts
-	ln -s /dev/touchscreen/0raw /dev/tsraw
-	ln -s /dev/vc/0 /dev/tty0
-	ln -s /dev/vc/1 /dev/tty1
-	ln -s /dev/vc/2 /dev/tty2
-	ln -s /dev/vc/3 /dev/tty3
-	ln -s /dev/vc/4 /dev/tty4
-	ln -s /dev/vc/5 /dev/tty5
-	ln -s /dev/fb/0 /dev/fb0
-#	ln -s /dev/tts/0 /dev/ttySA0
-#	ln -s /dev/tts/1 /dev/ttySA1
-#	ln -s /dev/tts/2 /dev/ttySA2
-
-	ln -s /dev/sound/dsp /dev/dsp
-	ln -s /dev/sound/mixer /dev/mixer
-
-	ln -s /dev/v4l/video0 /dev/video0
-	ln -s /dev/v4l/video0 /dev/video
-	ln -s /dev/misc/rtc /dev/rtc
-
-	## need this so that ppp will autoload the ppp modules
-	mknod /dev/ppp c 108 0
-	if test "$VERBOSE" != "no"; then echo "done"; fi
-else
-	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
-	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
-	if test $? -ne 0; then
-		if test "$VERBOSE" != "no"; then echo "failed"; fi
-	else
-		if test "$VERBOSE" != "no"; then echo "done"; fi
-	fi
-	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
-	cd /
-	mkdir -p dev/msys
-	mkdir -p dev/pts
-	mkdir -p dev/input
-	mkdir -p dev/vc
-	for i in 0 1 2 3 4 5 6 7 8 9; do
-		ln -s /dev/tty$i /dev/vc/$i
-	done
-	ln -sf /dev/sharp_ts /dev/ts
-        ln -sf /dev/sharp_fl /dev/fl
-	ln -sf /proc/self/fd /dev/fd
-	ln -sf /proc/kcore /dev/core
-	/sbin/makedevs -r / -D /etc/device_table
-	if test $? -ne 0; then
-		if test "$VERBOSE" != "no"; then echo "failed"; fi
-	else
-		if test "$VERBOSE" != "no"; then echo "done"; fi
-	fi
-fi
-
-exit 0
diff --git a/packages/initscripts/initscripts-1.0/shepherd/devices b/packages/initscripts/initscripts-1.0/shepherd/devices
deleted file mode 100644
index b3a3323b8a..0000000000
--- a/packages/initscripts/initscripts-1.0/shepherd/devices
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# Devfs handling script.  Since we arent running devfsd due to various reasons
-# which I will not lay out here, we need to create some links for compatibility.
-
-. /etc/default/rcS
-
-if test -e /dev/.devfsd
-then
-	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
-	ln -s /dev/touchscreen/0 /dev/ts
-	ln -s /dev/touchscreen/0raw /dev/tsraw
-	ln -s /dev/vc/0 /dev/tty0
-	ln -s /dev/vc/1 /dev/tty1
-	ln -s /dev/vc/2 /dev/tty2
-	ln -s /dev/vc/3 /dev/tty3
-	ln -s /dev/vc/4 /dev/tty4
-	ln -s /dev/vc/5 /dev/tty5
-	ln -s /dev/fb/0 /dev/fb0
-#	ln -s /dev/tts/0 /dev/ttySA0
-#	ln -s /dev/tts/1 /dev/ttySA1
-#	ln -s /dev/tts/2 /dev/ttySA2
-
-	ln -s /dev/sound/dsp /dev/dsp
-	ln -s /dev/sound/mixer /dev/mixer
-
-	ln -s /dev/v4l/video0 /dev/video0
-	ln -s /dev/v4l/video0 /dev/video
-	ln -s /dev/misc/rtc /dev/rtc
-
-	## need this so that ppp will autoload the ppp modules
-	mknod /dev/ppp c 108 0
-	if test "$VERBOSE" != "no"; then echo "done"; fi
-else
-	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
-	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
-	if test $? -ne 0; then
-		if test "$VERBOSE" != "no"; then echo "failed"; fi
-	else
-		if test "$VERBOSE" != "no"; then echo "done"; fi
-	fi
-	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
-	cd /
-	mkdir -p dev/msys
-	mkdir -p dev/pts
-	mkdir -p dev/input
-	mkdir -p dev/vc
-	for i in 0 1 2 3 4 5 6 7 8 9; do
-		ln -s /dev/tty$i /dev/vc/$i
-	done
-	ln -sf /dev/sharp_ts /dev/ts
-        ln -sf /dev/sharp_fl /dev/fl
-	ln -sf /proc/self/fd /dev/fd
-	ln -sf /proc/kcore /dev/core
-	/sbin/makedevs -r / -D /etc/device_table
-	if test $? -ne 0; then
-		if test "$VERBOSE" != "no"; then echo "failed"; fi
-	else
-		if test "$VERBOSE" != "no"; then echo "done"; fi
-	fi
-fi
-
-exit 0
diff --git a/packages/initscripts/initscripts-1.0/shepherd/keymap b/packages/initscripts/initscripts-1.0/shepherd/keymap
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/initscripts/initscripts-1.0/shepherd/keymap
+++ /dev/null
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 5fd5f52ebb..d5728c1e86 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r32"
+PR = "r33"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -34,9 +34,7 @@ SRC_URI = "file://halt \
 
 SRC_URI_append_arm = " file://alignment.sh"
 SRC_URI_append_openzaurus = " file://checkversion"
-SRC_URI_append_corgi =    " file://keymap"
-SRC_URI_append_shepherd = " file://keymap"
-SRC_URI_append_husky =    " file://keymap"
+SRC_URI_append_c7x0 =    " file://keymap"
 
 def read_kernel_version(d):
 	import bb
@@ -93,10 +91,10 @@ do_install () {
 		ln -sf          ../init.d/checkversion  ${D}/etc/rcS.d/S05version
 	fi
 
-	if [ "${MACHINE}" == "corgi" -o "${MACHINE}" == "shepherd" -o "${MACHINE}" == "husky" ]; then
+	if [ "${MACHINE}" == "c7x0" ]; then
 		install -m 0755    ${WORKDIR}/corgikeymap-2.6.map		${D}/etc
-		install -m 0755    ${WORKDIR}/keymap			${D}/etc/init.d
-		ln -sf          ../init.d/keymap  	${D}/etc/rcS.d/S04keymap
+		install -m 0755    ${WORKDIR}/keymap				${D}/etc/init.d
+		ln -sf          ../init.d/keymap  				${D}/etc/rcS.d/S04keymap
 	fi