diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-01-29 04:26:52 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-01-29 04:26:52 +0000 |
| commit | 9d15b95ba5ce645156381004224b595129347f3b (patch) | |
| tree | 77ff8e274c85ea7b0ad9eb2687cd36c19339e220 | |
| parent | 9ab47229a716f3bf8e6f3601458c1aede5f91913 (diff) | |
slugos-image: Removed Apex from the image
| -rw-r--r-- | packages/images/slugos-image.bb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index 64b7d8b8e0..5d7fed7cb5 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Generic SlugOS image" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r43" +PR = "r44" COMPATIBLE_MACHINE = "nslu2" @@ -112,7 +112,7 @@ python () { # it is a bad idea to produce flash images without a valid RedBoot - that allows # an innocent user upgrade attempt to instantly brick the NSLU2. PACK_IMAGE += "${@['', 'slugos_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}" -PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}" +PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}" NSLU2_SLUGIMAGE_ARGS ?= "" @@ -122,15 +122,14 @@ slugos_pack_image() { ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/ install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${SITEINFO_ENDIANESS} \ ${DEPLOY_DIR_IMAGE}/slug/vmlinuz install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/ cd ${DEPLOY_DIR_IMAGE}/slug - slugimage -p -b RedBoot -s SysConf -L apex.bin -k vmlinuz \ - -r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ + slugimage -p -b RedBoot -s SysConf -k vmlinuz \ + -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin \ ${NSLU2_SLUGIMAGE_ARGS} rm -rf ${DEPLOY_DIR_IMAGE}/slug |