diff options
author | Rod Whitby <rod@whitby.id.au> | 2005-12-05 13:52:56 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-12-05 13:52:56 +0000 |
commit | 56e3cfd5bc911e4e47ae00c8bafb785d48b0b7c5 (patch) | |
tree | dbcf26ae9f2bcc533f3b55121ec7d321378abca9 /packages | |
parent | 67a233ecaa6ac6f117f7792429b489f806b320b3 (diff) | |
parent | 77c2adc046dcb2841bffa98a8a5474db8441f7ae (diff) |
merge of adb05dcda79a04e8d0e9cb1eb7976a9fa2c3d31e
and d510fe2c093aff12bc3223326057244c800701ad
Diffstat (limited to 'packages')
-rw-r--r-- | packages/linux/unslung-kernel_2.4.22.l2.3r63.bb | 2 | ||||
-rw-r--r-- | packages/meta/unslung-image.bb | 4 | ||||
-rwxr-xr-x | packages/nslu2-binary-only/unslung-rootfs/unsling | 12 | ||||
-rw-r--r-- | packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb | 2 |
4 files changed, 11 insertions, 9 deletions
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 3b84269891..8752a6ed04 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>" -PR = "r3" +PR = "r4" KERNEL_SUFFIX = "unslung" diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb index 7fa1b1cd4c..f9fda0aedc 100644 --- a/packages/meta/unslung-image.bb +++ b/packages/meta/unslung-image.bb @@ -1,5 +1,5 @@ LICENSE = MIT -PR = "r6" +PR = "r7" IMAGE_BASENAME = "unslung" @@ -31,6 +31,8 @@ unslung_clean_image () { rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version # Tidy up some thing which are in the wrong place mv ${IMAGE_ROOTFS}${libdir}/libipkg* ${IMAGE_ROOTFS}/lib/ + # Remove the /lib/*.dat files cause they are too big + rm -f ${IMAGE_ROOTFS}/lib/*.dat # Remove the ipkg symlink - unsling puts it back in rm -f ${IMAGE_ROOTFS}${bindir}/ipkg # Hack out the modutils stuff - it's too hard to make it work diff --git a/packages/nslu2-binary-only/unslung-rootfs/unsling b/packages/nslu2-binary-only/unslung-rootfs/unsling index b784378812..c78bb7bbfe 100755 --- a/packages/nslu2-binary-only/unslung-rootfs/unsling +++ b/packages/nslu2-binary-only/unslung-rootfs/unsling @@ -12,22 +12,22 @@ fi if [ $# -eq 1 ] ; then if [ "$1" = "disk1" ] ; then targ=/share/hdd/data - flag=.sda1root + flag=.sdb1root elif [ "$1" = "disk2" ] ; then targ=/share/flash/data - flag=.sdb1root + flag=.sda1root elif [ "$1" = "hdd-data" ] ; then targ=/share/hdd/data - flag=.sda1root + flag=.sdb1root elif [ "$1" = "hdd-conf" ] ; then targ=/share/hdd/conf - flag=.sda2root + flag=.sdb2root elif [ "$1" = "flash-data" ] ; then targ=/share/flash/data - flag=.sdb1root + flag=.sda1root elif [ "$1" = "flash-conf" ] ; then targ=/share/flash/conf - flag=.sdb2root + flag=.sda2root else echo $usage exit 1 diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb index 2f2e5e1866..7749db06d5 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb @@ -1,6 +1,6 @@ SECTION = "base" -PR = "r3" +PR = "r4" DEPENDS = "nslu2-linksys-libs" |