diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/fis/fis_1.0.bb | 17 | ||||
| -rw-r--r-- | packages/images/foonas-image.bb | 50 |
2 files changed, 11 insertions, 56 deletions
diff --git a/packages/fis/fis_1.0.bb b/packages/fis/fis_1.0.bb index 09bfa90a36..ea4c0af6c8 100644 --- a/packages/fis/fis_1.0.bb +++ b/packages/fis/fis_1.0.bb @@ -5,31 +5,14 @@ DEPENDS = "boost" SRC_URI = "http://svn.chezphil.org/utils/trunk/fis.cc \ svn://svn.chezphil.org/;module=libpbe;proto=http" -PACKAGES =+ "fis-static" -FILES_${PN}-static = "${sbindir}/fis-static" -FILES_${PN} = "${sbindir}/fis" - do_compile() { ${CXX} -Os -W -I${STAGING_INCDIR} -I${WORKDIR}/libpbe/trunk/include -o fis ${WORKDIR}/fis.cc \ ${WORKDIR}/libpbe/trunk/src/Exception.cc ${WORKDIR}/libpbe/trunk/src/utils.cc - - # Work around boost threading issue when compiling static - # We're singlethreading anyway - - echo "#define BOOST_SP_DISABLE_THREADS" > ${WORKDIR}/tmpfile - cat ${WORKDIR}/tmpfile ${WORKDIR}/fis.cc > ${WORKDIR}/fis.new - mv ${WORKDIR}/fis.new ${WORKDIR}/fis.cc - rm ${WORKDIR}/tmpfile - - ${CXX} -Os -W -static -I${STAGING_INCDIR} -I${WORKDIR}/libpbe/trunk/include -o fis-static ${WORKDIR}/fis.cc \ - ${WORKDIR}/libpbe/trunk/src/Exception.cc ${WORKDIR}/libpbe/trunk/src/utils.cc } do_install() { - ${STRIP} ${WORKDIR}/fis-${PV}/fis-static ${STRIP} ${WORKDIR}/fis-${PV}/fis install -d ${D}/${sbindir} - install -m 755 ${WORKDIR}/fis-${PV}/fis-static ${D}/${sbindir} install -m 755 ${WORKDIR}/fis-${PV}/fis ${D}/${sbindir} } 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() { |