diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/nslu2_flashimg.oeclass | 5 | ||||
| -rw-r--r-- | classes/rootfs_ipk.oeclass | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/classes/nslu2_flashimg.oeclass b/classes/nslu2_flashimg.oeclass index f6170b9b73..ed8bbf7e59 100644 --- a/classes/nslu2_flashimg.oeclass +++ b/classes/nslu2_flashimg.oeclass @@ -4,12 +4,11 @@ nslu2_pack_image () { ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${STAGING_KERNEL_DIR}/zImage ${DEPLOY_DIR_IMAGE}/slug/vmlinuz + install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-${IMAGE_BASENAME} ${DEPLOY_DIR_IMAGE}/slug/vmlinuz install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug/ramdisk.gz cd ${DEPLOY_DIR_IMAGE}/slug slugtool pack ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.img - rm -f ${DEPLOY_DIR_IMAGE}/zImage* ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz - rm -rf ${DEPLOY_DIR_IMAGE}/slug + rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug } EXTRA_IMAGEDEPENDS += 'slugtool-native nslu2-firmware-binary' diff --git a/classes/rootfs_ipk.oeclass b/classes/rootfs_ipk.oeclass index 96f060449b..772984cc2f 100644 --- a/classes/rootfs_ipk.oeclass +++ b/classes/rootfs_ipk.oeclass @@ -50,7 +50,9 @@ EOF fi done ipkg-cl ${IPKG_ARGS} update - ipkg-cl ${IPKG_ARGS} install ${IPKG_INSTALL} + if [ ! -z "${IPKG_INSTALL}" ]; then + ipkg-cl ${IPKG_ARGS} install ${IPKG_INSTALL} + fi export D=${IMAGE_ROOTFS} export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS} |