From b480099179a200a86cf2b4e46941c005f44c2435 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 2 Nov 2004 23:16:15 +0000 Subject: Merge openembedded@openembedded.bkbits.net:packages-devel into handhelds.org:/home/kergoth/code/packages 2004/11/02 17:15:23-06:00 handhelds.org!kergoth Upgrade udev to 042, kill old versions to reduce maintainance headaches. 2004/11/02 16:46:24-06:00 handhelds.org!kergoth Merge http://nslu2-linux.bkbits.net/packages into handhelds.org:/home/kergoth/code/packages 2004/11/03 09:48:56+11:00 black.lan!peteru Merge nslu2-linux@nslu2-linux.bkbits.net:packages into black.lan:/home/slug/bk/packages 2004/11/03 09:36:32+11:00 black.lan!peteru kernel, ramdisk and image variants. Currently ramdisk variants are broken. Pushing anyway, so that OE experts can help with fixing the issue. 2004/10/31 13:48:09-10:00 (none)!dereky defconfig: Add raid lines 2004/11/01 09:26:07+10:30 (none)!rwhitby Added the -able image to Unslung 2004/11/01 01:37:33+11:00 black.lan!peteru Create a new image for unslung-able. 2004/10/31 10:33:14+10:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/10/31 10:31:48+10:30 (none)!rwhitby Added slingbox to Unslung image 2004/10/31 10:25:02+10:30 (none)!rwhitby Added slingbox to Unslung image 2004/10/30 16:34:07-04:00 rant-central.com!CodeWhacker Merge bk://nslu2-linux.bkbits.net/packages into rant-central.com:/home/roy/workspace/NSLU2/oe/packages 2004/10/30 16:29:33-04:00 rant-central.com!CodeWhacker Rearrange tar args in ipkg-build to avoid the error messages some tar versions produce when there are args after the source files list. 2004/10/29 11:18:45+09:30 (none)!rwhitby Unslung: Make sure that /root exists after unslinging. 2004/10/29 09:54:54+09:30 (none)!rwhitby Unslung: Fixed the unsling script so it removes conflicting files from an old unslung root partition. 2004/10/28 17:00:22-07:00 bkbits.net!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into bkbits.net:/repos/n/nslu2-linux/packages 2004/10/25 14:23:02-04:00 uottawa.ca!stephane Added /dev entry for NSLU2's software-based I2C adapter. 2004/10/25 14:21:22-04:00 uottawa.ca!stephane Initial integration of Kas11's x1205-rtc drivers. 2004/10/25 23:49:37+09:30 (none)!rwhitby Fixed a bug in nslu2-unslung-ramdisk 2004/10/25 22:35:52+09:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/10/25 05:58:22-07:00 bkbits.net!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages into bkbits.net:/repos/n/nslu2-linux/packages 2004/10/25 22:21:41+09:30 (none)!rwhitby Unslung: Added the Unslung Doc link to the User Guide page, and added the flashfs script. 2004/10/25 10:15:35+02:00 (none)!chriz Fix for Genesys Logic based devices (e.g. gl811e). For details refer to: http://www.mail-archive.com/linux-usb-users@lists.sourceforge.net/msg10941.html http://www.mail-archive.com/linux-usb-users@lists.sourceforge.net/msg10981.html BKrev: 4188153fr__wrRFQlfc9zi6SJ3JVsw --- meta/unslung-ext3flash-image.oe | 0 meta/unslung-image-able.oe | 0 meta/unslung-image-base.oe | 29 +++++++++++++++++++++++++++++ meta/unslung-image-ext3flash.oe | 0 meta/unslung-image-standard.oe | 0 meta/unslung-image-vfatdisk2-image.oe | 0 meta/unslung-image-vfatdisk2.oe | 0 meta/unslung-image.oe | 2 +- meta/unslung-standard-image.oe | 0 meta/unslung-vfatdisk2-image.oe | 0 10 files changed, 30 insertions(+), 1 deletion(-) delete mode 100644 meta/unslung-ext3flash-image.oe create mode 100644 meta/unslung-image-able.oe create mode 100644 meta/unslung-image-ext3flash.oe create mode 100644 meta/unslung-image-standard.oe create mode 100644 meta/unslung-image-vfatdisk2-image.oe create mode 100644 meta/unslung-image-vfatdisk2.oe delete mode 100644 meta/unslung-standard-image.oe delete mode 100644 meta/unslung-vfatdisk2-image.oe (limited to 'meta') diff --git a/meta/unslung-ext3flash-image.oe b/meta/unslung-ext3flash-image.oe deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/meta/unslung-image-able.oe b/meta/unslung-image-able.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/unslung-image-base.oe b/meta/unslung-image-base.oe index e69de29bb2..061b77c9bc 100644 --- a/meta/unslung-image-base.oe +++ b/meta/unslung-image-base.oe @@ -0,0 +1,29 @@ +IMAGE_LINGUAS = "" +USE_DEVFS = "1" + +UNSLUNG_BASE_PACKAGES = "nslu2-unslung-ramdisk slingbox ipkg wget" + +IPKG_INSTALL = "${UNSLUNG_BASE_PACKAGES}" + +DEPENDS ?= "virtual/kernel ${UNSLUNG_BASE_PACKAGES}" +IMAGE_BASENAME ?= "unslung" + +UNSLUNG_DEVICE_TABLE = "${@oe.which(oe.data.getVar('OEPATH', d, 1), 'files/device_table-unslung.txt')}" +EXTRA_IMAGECMD_ext2.gz = "-f ${UNSLUNG_DEVICE_TABLE}" + +IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; " + +inherit image_ipk + +# Note that anything in this function must be repeatable without having to rebuild the rootfs +unslung_clean_image () { + + # Remove all traces of the ipkg stuff we did to get this rootfs + rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg + if [ -f ${IMAGE_ROOTFS}/usr/bin/ipkg-cl ]; then + rm -f ${IMAGE_ROOTFS}/usr/bin/ipkg + mv ${IMAGE_ROOTFS}/usr/bin/ipkg-cl ${IMAGE_ROOTFS}/usr/bin/ipkg + fi + rm -f ${IMAGE_ROOTFS}/usr/bin/update-alternatives + +} diff --git a/meta/unslung-image-ext3flash.oe b/meta/unslung-image-ext3flash.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/unslung-image-standard.oe b/meta/unslung-image-standard.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/unslung-image-vfatdisk2-image.oe b/meta/unslung-image-vfatdisk2-image.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/unslung-image-vfatdisk2.oe b/meta/unslung-image-vfatdisk2.oe new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/unslung-image.oe b/meta/unslung-image.oe index dc51ef35e6..f17a295c5f 100644 --- a/meta/unslung-image.oe +++ b/meta/unslung-image.oe @@ -1 +1 @@ -DEPENDS = "unslung-standard-image unslung-ext3flash-image unslung-vfatdisk2-image" +DEPENDS = "unslung-standard-image unslung-ext3flash-image unslung-vfatdisk2-image unslung-able-image" diff --git a/meta/unslung-standard-image.oe b/meta/unslung-standard-image.oe deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/meta/unslung-vfatdisk2-image.oe b/meta/unslung-vfatdisk2-image.oe deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3