[oe-commits] org.oe.dev foonas-image: Move preprocessing away

[nail commit]

foonas-image: Move preprocessing away

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

#
# mt diff -r67907ca02a1f013638c0a53ef16be9cfb2e71539 -r0ec41d71735e8dfa327869c5a3211eebe422e917
#
# 
# 
# patch "packages/images/foonas-image.bb"
#  from [6428675b8c4a2350af6d07ac048723eb110cd1e8]
#    to [4ba043e6eaa0d9840d1a064d08eca0ee9363e94b]
# 
============================================================
--- packages/images/foonas-image.bb	6428675b8c4a2350af6d07ac048723eb110cd1e8
+++ packages/images/foonas-image.bb	4ba043e6eaa0d9840d1a064d08eca0ee9363e94b
@@ -1,16 +1,12 @@ PR = "r0"
 DESCRIPTION = "Foonas image"
 LICENSE = "GPL"
 PR = "r0"
 
-inherit image
+inherit image n2100-image turbostation-image lsppchg-image lsppchd-image storcenter-image
 
 DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native"
 
-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;"
-FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}"
-EXTRA_IMAGECMD_jffs2 += " --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}"
+EXTRA_IMAGECMD_jffs2 += " --pad --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}"
 IMAGE_LINGUAS = ""
 
 RDEPENDS = " \
@@ -20,11 +16,10 @@ RDEPENDS = " \
 	module-init-tools-depmod modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
 	libgcc1 diffutils cpio findutils\
-	portmap dropbear e2fsprogs-blkid \
+	dropbear e2fsprogs-blkid \
 	mdadm hdparm mtd-utils udev \
 	${FOONAS_SUPPORT} \
 	${FOONAS_KERNEL} "
 
 PACKAGE_INSTALL = "${RDEPENDS}"
 
-inherit n2100-image turbostation-image lsppchg-image lsppchd-image