diff options
| -rw-r--r-- | conf/distro/foonas.conf | 7 | ||||
| -rw-r--r-- | conf/machine/n2100.conf | 9 | ||||
| -rw-r--r-- | conf/machine/turbostation.conf | 8 | ||||
| -rw-r--r-- | packages/images/foonas-image.bb | 50 |
4 files changed, 23 insertions, 51 deletions
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index bd2a0e4e5e..b0f47c6dc0 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -30,10 +30,12 @@ IMAGE_FSTYPES = "jffs2" 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/armeb-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/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 @@ PREFERRED_VERSION_glibc-intermediate = "2.5" 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" diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index 619b0f4339..554157ca85 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -3,7 +3,6 @@ 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_PROVIDER_virtual/kernel = "linux" 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" diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index 7f7d24c1e9..41dfd8d09e 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -11,16 +11,16 @@ USE_VT="0" MODUTILS=26 MACHINE_FEATURES= "kernel26 usbhost" PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation" - -# Do we need any kernel modules? -OPENTURBOSTATION_KERNEL = "" +FOONAS_KERNEL = "kernel-module-ext3 kernel-module-minix \ + kernel-module-usb-storage" # 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" diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb index 23059d9bca..ae9f8d4450 100644 --- a/packages/images/foonas-image.bb +++ b/packages/images/foonas-image.bb @@ -2,48 +2,22 @@ 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;" - -# 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" +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 = "" RDEPENDS = " \ base-files base-passwd netbase \ @@ -51,7 +25,7 @@ RDEPENDS = " \ 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 @@ RDEPENDS = " \ PACKAGE_INSTALL = "${RDEPENDS}" -inherit image - # At this point you have to make a ${MACHINE}_pack_image for your machine. turbostation_pack_image() { |