foonas: Update image config, move crap from distro config

diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index 39bcaf0..b430902 100644 (file)
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -19,18 +19,12 @@ HOTPLUG = "udev"
 FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage"
 FOONAS_SUPPORT_n2100 += "fis"
 BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm"
-EXTRA_IMAGECMD_n2100 = "--little-endian"
-ERASEBLOCK_SIZE_n2100 = "0x20000"
-IMAGE_FSTYPES_n2100 = "jffs2"
 
 # Various defines for QNAP Turbostation
 FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \
                                kernel-module-usb-storage"
 FOONAS_SUPPORT_turbostation += "uboot-utils"
 BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm"
-EXTRA_IMAGECMD_turbostation = "--big-endian"
-ERASEBLOCK_SIZE_turbostation = "0x20000"
-IMAGE_FSTYPES_turbostation = "jffs2"
 
 # Various defines for Linkstations
 FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \

diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb
index 3d2c621..efb1033 100644 (file)
--- a/packages/images/foonas-image.bb
+++ b/packages/images/foonas-image.bb
@@ -5,12 +5,24 @@ PR = "r0"
 inherit image
 
 DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native"
+
+# Various defines for Thecus N2100
 DEPENDS_n2100 += "openssl-native"
+EXTRA_IMAGECMD_n2100 = "--little-endian"
+ERASEBLOCK_SIZE_n2100 = "0x20000"
+IMAGE_FSTYPES_n2100 = "jffs2"
+IMAGE_POSTPROCESS_COMMAND_n2100 += '${MACHINE}_pack_image;'
+
+# Various defines for QNAP Turbostation TS[12]01
+EXTRA_IMAGECMD_turbostation = "--big-endian"
+ERASEBLOCK_SIZE_turbostation = "0x20000"
+IMAGE_FSTYPES_turbostation = "jffs2"
+IMAGE_POSTPROCESS_COMMAND_turbostation += '${MACHINE}_pack_image;'
 
+# Various defines for Buffalo Linkstations
+IMAGE_POSTPROCESS_COMMAND_lsppchd += ""
+IMAGE_POSTPROCESS_COMMAND_lsppchg += "${IMAGE_POSTPROCESS_COMMAND_lsppchd}"
 
-IMAGE_POSTPROCESS_COMMAND += "${PACK_IMAGE}"
-PACK_IMAGE_DEPENDS = ""
-PACK_IMAGE = '${MACHINE}_pack_image;'
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"