[oe-commits] org.oe.dev foonas: Update image config, move crap from distro config

[nail commit]

foonas: Update image config, move crap from distro config

Author: nail at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 9e3f5936560961ed9fb5c09b73f338339b8f10d4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9e3f5936560961ed9fb5c09b73f338339b8f10d4
Files:
1
conf/distro/foonas.conf
packages/images/foonas-image.bb
Diffs:

#
# mt diff -r40982544ea697580565359a46f1c1a22b6a745b7 -r9e3f5936560961ed9fb5c09b73f338339b8f10d4
#
# 
# 
# patch "conf/distro/foonas.conf"
#  from [43db486cb7b68103b62ac02cb1638ba8305cba6c]
#    to [8bcfe9893c9854cff1b28181932e2ae0ab010900]
# 
# patch "packages/images/foonas-image.bb"
#  from [3d25ebdcc623226bf9a751950666d7398745dbba]
#    to [52c1917a44ffdf2a504bba23c75962ebef72e2cb]
# 
============================================================
--- conf/distro/foonas.conf	43db486cb7b68103b62ac02cb1638ba8305cba6c
+++ conf/distro/foonas.conf	8bcfe9893c9854cff1b28181932e2ae0ab010900
@@ -19,18 +19,12 @@ BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev m
 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 \
============================================================
--- packages/images/foonas-image.bb	3d25ebdcc623226bf9a751950666d7398745dbba
+++ packages/images/foonas-image.bb	52c1917a44ffdf2a504bba23c75962ebef72e2cb
@@ -5,12 +5,24 @@ DEPENDS = "${MACHINE_TASK_PROVIDER} make
 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;'
 
-IMAGE_POSTPROCESS_COMMAND += "${PACK_IMAGE}"
-PACK_IMAGE_DEPENDS = ""
-PACK_IMAGE = '${MACHINE}_pack_image;'
+# Various defines for Buffalo Linkstations
+IMAGE_POSTPROCESS_COMMAND_lsppchd += ""
+IMAGE_POSTPROCESS_COMMAND_lsppchg += "${IMAGE_POSTPROCESS_COMMAND_lsppchd}"
+
 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;"