diff options
| -rw-r--r-- | classes/nslu2-image.bbclass | 4 | ||||
| -rw-r--r-- | conf/machine/nslu2be.conf | 1 | ||||
| -rw-r--r-- | conf/machine/nslu2le.conf | 2 | ||||
| -rw-r--r-- | packages/images/unslung-image.bb | 50 | ||||
| -rw-r--r-- | packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 4 | ||||
| -rwxr-xr-x | packages/nslu2-binary-only/unslung-rootfs/unsling | 4 |
6 files changed, 11 insertions, 54 deletions
diff --git a/classes/nslu2-image.bbclass b/classes/nslu2-image.bbclass index e1af34fa57..14bf989055 100644 --- a/classes/nslu2-image.bbclass +++ b/classes/nslu2-image.bbclass @@ -16,5 +16,5 @@ nslu2_pack_image () { rm -rf ${DEPLOY_DIR_IMAGE}/slug } -EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native' -IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " +EXTRA_IMAGEDEPENDS_nslu2 += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native' +IMAGE_POSTPROCESS_COMMAND_nslu2 += "nslu2_pack_image; " diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf index 87fab62b65..104bbdb397 100644 --- a/conf/machine/nslu2be.conf +++ b/conf/machine/nslu2be.conf @@ -16,3 +16,4 @@ require conf/machine/include/ixp4xx.conf EXTRA_IMAGECMD_jffs2 += "--big-endian" +INHERIT += "nslu2-image" diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf index 16114a80fa..86c4ce7a31 100644 --- a/conf/machine/nslu2le.conf +++ b/conf/machine/nslu2le.conf @@ -15,3 +15,5 @@ ROOT_FLASH_SIZE ?= "6" require conf/machine/include/ixp4xx.conf EXTRA_IMAGECMD_jffs2 += "--little-endian" + +INHERIT += "nslu2-image" diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index 897fb131c1..a24271a9d6 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -PR = "r25" +PR = "r26" COMPATIBLE_MACHINE = "nslu2" IMAGE_BASENAME = "unslung" @@ -12,17 +12,11 @@ DEPENDS = "virtual/kernel \ ${UNSLUNG_EXTRA_DEPENDS}" RDEPENDS = "kernel update-modules unslung-rootfs \ - libc6-unslung slingbox ipkg \ - libipkg \ -# cpio \ -# findutils \ + libc6-unslung slingbox ipkg libipkg \ ${UNSLUNG_EXTRA_RDEPENDS}" PACKAGE_INSTALL = "kernel update-modules unslung-rootfs \ - libc6-unslung slingbox ipkg \ - libipkg \ -# cpio \ -# findutils \ + libc6-unslung slingbox ipkg libipkg \ kernel-module-netconsole \ ${UNSLUNG_EXTRA_INSTALL}" @@ -76,27 +70,6 @@ unslung_clean_image () { ${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 -# MJW - experimental right now, but no longer need cpio and find - # We need cpio and find, but we don't need any of the other stuff in - # the packages (users can install the full package with ipkg after - # unsling). Remove the extra files and executables, and clean up - # the entries from the ipkg database manually. - - #-- these are for cpio: -# rm -f ${IMAGE_ROOTFS}/usr/bin/mt -# rm -rf ${IMAGE_ROOTFS}/usr/libexec -# rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/cpio.* -# rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/rmt -# sed -i -e '/^Package: cpio/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status - - #-- and these for find: -# rm -f ${IMAGE_ROOTFS}/usr/bin/locate -# rm -f ${IMAGE_ROOTFS}/usr/bin/updatedb -# rm -f ${IMAGE_ROOTFS}/usr/bin/xargs -# rm -f ${IMAGE_ROOTFS}/usr/bin/xargs.findutils -# rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/findutils.* -# sed -i -e '/^Package: findutils/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status - # FIXME: change made 24 Jul 2006 by the OE folks changes the "strip" # behavior to create an extra file named .debug/<filename> containing # the stripped symbols. These files are supposed to be packaged @@ -120,20 +93,3 @@ unslung_clean_image () { # #### End of Hack! } - -nslu2_pack_image () { - install -d ${DEPLOY_DIR_IMAGE}/slug - install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ - ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ - ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ - ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-${IMAGE_BASENAME} ${DEPLOY_DIR_IMAGE}/slug/vmlinuz - install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 - cd ${DEPLOY_DIR_IMAGE}/slug - slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t Trailer \ - -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img - rm -rf ${DEPLOY_DIR_IMAGE}/slug -} - -EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware' -IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 531f389898..df3141725c 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device" LICENSE = "GPL" -PR = "r17" +PR = "r18" COMPATIBLE_HOST = 'arm.*-linux' COMPATIBLE_MACHINE = "nslu2" @@ -39,7 +39,7 @@ inherit kernel ARCH = "arm" KERNEL_IMAGETYPE = "zImage" -KERNEL_SUFFIX = "unslung" +KERNEL_SUFFIX = "${MACHINE}" CMDLINE_CONSOLE ?= "ttyS0,115200" CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M@0x00000000" CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}" diff --git a/packages/nslu2-binary-only/unslung-rootfs/unsling b/packages/nslu2-binary-only/unslung-rootfs/unsling index 6c4dc4ca52..539a1d2b58 100755 --- a/packages/nslu2-binary-only/unslung-rootfs/unsling +++ b/packages/nslu2-binary-only/unslung-rootfs/unsling @@ -182,9 +182,7 @@ if ! [ -d $targ/public ] || ! [ -f $targconf/.dongle ] || ! [ -f $targconf/passw echo "the device, or the formatting of the device." exit 1 fi -# /usr/bin/find / -xdev -print | /usr/bin/cpio -p -d -m -u $targ -# rm -rf $targ/dev ; mv $targ/dev.state $targ/dev -# rm -rf $targ/var ; mv $targ/var.state $targ/var + echo "./var/tmp" > /tmp/xfile echo "./dev.state" >> /tmp/xfile echo "./var.state" >> /tmp/xfile |