diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2004-11-17 07:53:50 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2004-11-17 07:53:50 +0000 |
| commit | 655aa8c859a04f87a9a07a52a2b700c644082aa5 (patch) | |
| tree | 81618d5a9beab43d297bea8c505e8322e4bdb0aa /meta | |
| parent | 259cbc30feb02f7e320db981a88354919daa0537 (diff) | |
Merge bk://openembedded.bkbits.net/packages-devel
into bkbits.net:/repos/n/nslu2-linux/packages
2004/11/17 07:16:00+10:30 (none)!rwhitby
Unslung now generates jffs2 images too
2004/11/16 22:13:02+10:30 (none)!rwhitby
Switchbox now drops to shell if a valid rootfs cannot be mounted
2004/11/16 21:51:03+10:30 (none)!rwhitby
Changed switchbox back to ext2.gz
2004/11/16 20:07:19+10:30 (none)!rwhitby
Merge
2004/11/16 20:05:22+10:30 (none)!rwhitby
Created switchbox distro
2004/11/16 00:14:27-08:00 bkbits.net!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages-devel
into bkbits.net:/repos/n/nslu2-linux/packages
2004/11/16 00:12:50-08:00 bkbits.net!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into bkbits.net:/repos/n/nslu2-linux/packages
2004/11/15 22:52:37-08:00 (none)!jacques
added nslu2-linksys-libs to UNSLUNG_BASE_PACKAGES
removed makedevs
2004/11/15 19:28:14-08:00 (none)!jacques
Removed unslung specific references from the switchbox linuxrc jffs2 stanza
changed /bin/echo "0x1f04" to /bin/echo "0x0100" in ramfs stanza
2004/11/15 19:18:28-08:00 (none)!jacques
removed init from switchbox and added loop block dev builtin to -able kernel
BKrev: 419b038ez0VSSujPdTan9b9QhMaDrw
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/switchbox-image.oe (renamed from meta/unslung-switchbox-image.oe) | 0 | ||||
| -rw-r--r-- | meta/unslung-image.oe | 2 | ||||
| -rw-r--r-- | meta/unslung-standard-image.oe | 10 |
3 files changed, 1 insertions, 11 deletions
diff --git a/meta/unslung-switchbox-image.oe b/meta/switchbox-image.oe index e69de29bb2..e69de29bb2 100644 --- a/meta/unslung-switchbox-image.oe +++ b/meta/switchbox-image.oe diff --git a/meta/unslung-image.oe b/meta/unslung-image.oe index 924dff024d..42ef5e2c2e 100644 --- a/meta/unslung-image.oe +++ b/meta/unslung-image.oe @@ -1 +1 @@ -DEPENDS = "unslung-switchbox-image unslung-standard-image unslung-able-image" +DEPENDS = "unslung-standard-image unslung-able-image" diff --git a/meta/unslung-standard-image.oe b/meta/unslung-standard-image.oe index 6af8c6b97d..e1e77396d4 100644 --- a/meta/unslung-standard-image.oe +++ b/meta/unslung-standard-image.oe @@ -20,22 +20,12 @@ RDEPENDS = "${UNSLUNG_BASE_PACKAGES} ${UNSLUNG_EXTRA_RDEPENDS}" RRECOMMENDS = "${UNSLUNG_EXTRA_RRECOMMENDS}" -UNSLUNG_DEVICE_TABLE = "${@oe.which(oe.data.getVar('OEPATH', d, 1), 'files/device_table-unslung.txt')}" - -IMAGE_FSTYPES = "ext2.gz jffs2" -EXTRA_IMAGECMD_ext2.gz = "-f ${UNSLUNG_DEVICE_TABLE}" -EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000" - 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 () { - - makedevs -r ${IMAGE_ROOTFS} -D ${UNSLUNG_DEVICE_TABLE} - # Remove info from the local feed used to build the image rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/* - } |