summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/lsppchd-image.bbclass10
-rw-r--r--classes/lsppchg-image.bbclass10
-rw-r--r--conf/machine/lsppchd.conf4
-rw-r--r--conf/machine/lsppchg.conf4
4 files changed, 4 insertions, 24 deletions
diff --git a/classes/lsppchd-image.bbclass b/classes/lsppchd-image.bbclass
deleted file mode 100644
index cb13222d64..0000000000
--- a/classes/lsppchd-image.bbclass
+++ /dev/null
@@ -1,10 +0,0 @@
-IMAGE_PREPROCESS_COMMAND_lsppchd += "export KPATH=`ls -tr ${IMAGE_ROOTFS}/boot/uImage-* | tail -1`; ln -sf /boot/${KPATH##*/} ${IMAGE_ROOTFS}/boot/uImage;"
-IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
-IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
-IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
-
-lsppchd_pack_image() {
-:
-}
-
-IMAGE_POSTPROCESS_COMMAND += "lsppchd_pack_image; "
diff --git a/classes/lsppchg-image.bbclass b/classes/lsppchg-image.bbclass
deleted file mode 100644
index 553414224d..0000000000
--- a/classes/lsppchg-image.bbclass
+++ /dev/null
@@ -1,10 +0,0 @@
-IMAGE_PREPROCESS_COMMAND_lsppchg += "export KPATH=`ls -tr ${IMAGE_ROOTFS}/boot/uImage-* | tail -1`; ln -sf /boot/${KPATH##*/} ${IMAGE_ROOTFS}/boot/uImage;"
-IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
-IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
-IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
-
-lsppchg_pack_image() {
-:
-}
-
-IMAGE_POSTPROCESS_COMMAND += "lsppchg_pack_image; "
diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
index 5d2ff2de41..171253bb96 100644
--- a/conf/machine/lsppchd.conf
+++ b/conf/machine/lsppchd.conf
@@ -1,7 +1,7 @@
#@TYPE: Machine
#@NAME: HD Linkstation
#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
+
UBOOT_MACHINE = "linkstation_HDLAN_config"
-require conf/machine/include/lsppc.inc
-INHERIT += "lsppchd-image"
+require conf/machine/include/lsppc.inc
diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
index 92e4ae4029..0a0d2fc1e1 100644
--- a/conf/machine/lsppchg.conf
+++ b/conf/machine/lsppchg.conf
@@ -1,7 +1,7 @@
#@TYPE: Machine
#@NAME: HG Linkstation
#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
+
UBOOT_MACHINE = "linkstation_HGLAN_config"
-require conf/machine/include/lsppc.inc
-INHERIT += "lsppchg-image"
+require conf/machine/include/lsppc.inc