[oe-commits] org.oe.dev foonas: Clean up distro/machines/image

nail commit openembedded-commits at lists.openembedded.org
Fri Mar 16 23:42:16 UTC 2007 

foonas: Clean up distro/machines/image

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

#
# mt diff -ree278dc3761030c4580d14178796befa85c10dcb -r0113d92ca6c2c5d48a385cf069c1ce5e2131b90c
#
# 
# 
# patch "conf/distro/foonas.conf"
#  from [2978bbbd680d43e2b1b336256918cd329791ba7d]
#    to [a100c5dd525fc1f25543bffe19c3d3e580843cbf]
# 
# patch "conf/machine/n2100.conf"
#  from [f8e81c56f6409b4005953383c3e4b75ad331fc40]
#    to [bab470a4824947a3f2b94bddd48a20522b56d335]
# 
# patch "conf/machine/turbostation.conf"
#  from [ac38d08023141a5f8dcf18de05f7309bd73c9644]
#    to [8c2e7199ee571287b57d37b89b6baeb44289cbd6]
# 
# patch "packages/images/foonas-image.bb"
#  from [44d98990ceee8b05e749435a07eed5dc6a949248]
#    to [5a1aeeba36b5db31e8657a8b4f5d246b30940c1e]
# 
============================================================
--- conf/distro/foonas.conf	2978bbbd680d43e2b1b336256918cd329791ba7d
+++ conf/distro/foonas.conf	a100c5dd525fc1f25543bffe19c3d3e580843cbf
@@ -30,10 +30,12 @@ PREFERRED_PROVIDER_virtual/arm-foonas-li
 
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate"
+
+# not used yet
 #PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate"
+#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 #PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate"
 #PREFERRED_PROVIDER_virtual/sparc-foonas-linux-libc-for-gcc = "glibc-intermediate"
 
@@ -83,7 +85,6 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 PREFERRED_VERSION_glibc-initial = "2.5"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-PREFERRED_VERSION_glib-2.0 = "2.12.10"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
 GLIBC_ADDONS ?= "ports,nptl,libidn"
 
============================================================
--- conf/machine/n2100.conf	f8e81c56f6409b4005953383c3e4b75ad331fc40
+++ conf/machine/n2100.conf	bab470a4824947a3f2b94bddd48a20522b56d335
@@ -1,9 +1,8 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv
 TARGET_ARCH = "arm"
 TARGET_OS = "linux"
 TARGET_FPU = "soft"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
-# terminal specs - console, but no other ports
 SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
@@ -13,15 +12,15 @@ PREFERRED_VERSION_linux = "2.6.20"
 PREFERRED_VERSION_linux = "2.6.20"
 
 # Do we need any kernel modules?
-#N2100_KERNEL = ""
+FOONAS_KERNEL = "kernel-module-ext2 kernel-module-usb-storage"
 
+FOONAS_SUPPORT += "fis"
+
 # We want udev support in the image
 udevdir = "/dev"
-N2100_SUPPORT ?= "cpio udev"
 BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
-EXTRA_IMAGECMD_jffs2 += " --little-endian"
 
-# Hardware stuff used in image generation
+EXTRA_IMAGECMD_jffs2 += " --little-endian"
 ERASEBLOCK_SIZE = "0x20000"	
 JFFS2_ROOTFS_SIZE = "0xC80000"
 KERNEL_IMAGE_SIZE = "0x280000"
============================================================
--- conf/machine/turbostation.conf	ac38d08023141a5f8dcf18de05f7309bd73c9644
+++ conf/machine/turbostation.conf	8c2e7199ee571287b57d37b89b6baeb44289cbd6
@@ -11,16 +11,16 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 MODUTILS=26
 MACHINE_FEATURES= "kernel26 usbhost"
 PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
+FOONAS_KERNEL = "kernel-module-ext3 kernel-module-minix \
+                        kernel-module-usb-storage"
 
-# Do we need any kernel modules?
-OPENTURBOSTATION_KERNEL = ""
-
 # We want udev support in the image
 udevdir = "/dev"
-TURBOSTATION_SUPPORT ?= "cpio uboot-utils udev"
 BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
+FOONAS_SUPPORT += "uboot-utils"
 
 # Hardware stuff used in image generation
+EXTRA_IMAGECMD = "--big-endian"
 ERASEBLOCK_SIZE = "0x20000"	
 JFFS2_ROOTFS_SIZE = "0xC80000"
 KERNEL_IMAGE_SIZE = "0x280000"
============================================================
--- packages/images/foonas-image.bb	44d98990ceee8b05e749435a07eed5dc6a949248
+++ packages/images/foonas-image.bb	5a1aeeba36b5db31e8657a8b4f5d246b30940c1e
@@ -1,57 +1,31 @@ PR = "r0"
 DESCRIPTION = "Foonas image"
 LICENSE = "GPL"
 PR = "r0"
 
+inherit image
+
 DEPENDS = "${MACHINE_TASK_PROVIDER}"
-EXTRA_IMAGECMD_turbostation = "--big-endian"
-EXTRA_IMAGECMD_n2100 = "--little-endian"
-EXTRA_IMAGECMD_jffs2 += " --eraseblock=${ERASEBLOCK_SIZE} -D ${SLUGOS_DEVICE_TABLE}"
-IMAGE_LINGUAS = ""
+DEPENDS_n2100 += "openssl-native"
 
-# This is passed to the image command to build the correct /dev
-# directory (because only the image program can make actual
-# dev entries!)
-SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}"
 
-# IMAGE_PREPROCESS_COMMAND is run before making the image.
-# We use this to do a few things:
-# . remove the uImage, which is in a separate part of the flash already.
-# . adjust the default run level (sysvinit is 5 by default, we like 3)
-# . set a default root password, which is no more secure than a blank one
-#	(since it is documented, in case you were wondering)
-# . make the boot more verbose
-#
+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;"
+IMAGE_PREPROCESS_COMMAND += "cp ${IMAGE_ROOTFS}/usr/sbin/fis-static ${DEPLOY_DIR_IMAGE}/; rm -f ${IMAGE_ROOTFS}/usr/sbin/fis-static"
+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}"
+IMAGE_LINGUAS = ""
 
-# Always just make a new flash image.
-PACK_IMAGE = '${MACHINE}_pack_image;'
-IMAGE_POSTPROCESS_COMMAND += "${PACK_IMAGE}"
-PACK_IMAGE_DEPENDS = ""
-#EXTRA_IMAGEDEPENDS += "${PACK_IMAGE_DEPENDS}"
-
-# These depends define native utilities - they do not get put in the flash and
-# are not required to build the image.
-IMAGE_TOOLS = ""
-#EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}"
-
-FOONAS_SUPPORT += "diffutils cpio findutils udev"
-FOONAS_SUPPORT_turbostation += "uboot-utils"
-
-# this gets /lib/modules made....
-FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \
-			kernel-module-usb-storage"
-
-FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage"
-
 RDEPENDS = " \
 	base-files base-passwd netbase \
         busybox initscripts foonas-init \
         update-modules sysvinit tinylogin \
 	module-init-tools-depmod modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
-	libgcc1 \
+	libgcc1 diffutils cpio findutils\
 	portmap \
 	dropbear \
 	e2fsprogs-blkid \
@@ -64,8 +38,6 @@ PACKAGE_INSTALL = "${RDEPENDS}"
 
 PACKAGE_INSTALL = "${RDEPENDS}"
 
-inherit image
-
 # At this point you have to make a ${MACHINE}_pack_image for your machine.
 
 turbostation_pack_image() {

More information about the Openembedded-commits mailing list