From 4476d4b3760464127d42bf6288405d0f4d5bb1a8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 6 Feb 2006 18:38:31 +0000 Subject: add class for nylon-image and update nylon distro configuration patches courtesy Martin Dietze Martin: I'm not sure whether you really need a dedicated class for nylon image, you may want to think about that. the patch against the mtx-1 machine configuration didn't apply, please handle this on your own after you got commit access. --- classes/nylon-image.bbclass | 16 ++++++++++++++++ conf/distro/nylon.conf | 17 ++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 classes/nylon-image.bbclass diff --git a/classes/nylon-image.bbclass b/classes/nylon-image.bbclass new file mode 100644 index 0000000000..8517c033e9 --- /dev/null +++ b/classes/nylon-image.bbclass @@ -0,0 +1,16 @@ +# we dont need the kernel in the image +ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*" + +# create a tar.gz (.imgz) file containing the filesystem and the kernel +nylon_create_imgz() { + rm -rf ${DEPLOY_DIR_IMAGE}/tmp + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.imgz + install -d ${DEPLOY_DIR_IMAGE}/tmp + + cp ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin ${DEPLOY_DIR_IMAGE}/tmp/zImage.flash + cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/tmp/rootfs.${type} + ( cd ${DEPLOY_DIR_IMAGE}/tmp; tar cvzf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.imgz * ) + rm -r ${DEPLOY_DIR_IMAGE}/tmp +} + +IMAGE_POSTPROCESS_COMMAND += "nylon_create_imgz;" diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index c7fcb83610..a1d81e336f 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -11,7 +11,7 @@ # # Bruno Randolf -INHERIT += "package_ipk debian" +INHERIT += "package_ipk debian nylon-mirrors" INHERIT += "linux_modules" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" @@ -37,11 +37,18 @@ PREFERRED_VERSION_usbutils = "0.11" # usually overrrided from local.conf NYLON_RELEASE = "unstable" -# use meshcub.org mirrors +# use meshcub.org mirrors for CVS sources CVS_TARBALL_STASH = "http://meshcube.org/nylon/${NYLON_RELEASE}/sources/" -INHERIT += "nylon-mirrors" -export FEED_URIS="nylon##http://meshcube.org/nylon/${NYLON_RELEASE}/feed" +export FEED_URIS = " \ + nylon##http://meshcube.org/nylon/${NYLON_RELEASE}/feed \ + nylon-bin##http://meshcube.org/nylon/${NYLON_RELEASE}/binary-feed" +# image names +DISTRO_VERSION = "${NYLON_VERSION}" +BUILDNAME := "${NYLON_VERSION}" +KERNEL_VERSION = "2.4.27" +#this does not work: ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')} IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}" -KERNEL_IMAGE_NAME = "kernel-${KV}-${MACHINE}_${BUILDNAME}" +KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}" + -- cgit v1.2.3