diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/nslu2-linksys-image.oe (renamed from meta/nslu2-image.oe) | 0 | ||||
| -rw-r--r-- | meta/unslung-able-image.oe | 0 | ||||
| -rw-r--r-- | meta/unslung-image-able.oe | 5 | ||||
| -rw-r--r-- | meta/unslung-image-base.oe | 29 | ||||
| -rw-r--r-- | meta/unslung-image-ext3flash.oe | 5 | ||||
| -rw-r--r-- | meta/unslung-image-standard.oe | 5 | ||||
| -rw-r--r-- | meta/unslung-image-vfatdisk2.oe | 5 | ||||
| -rw-r--r-- | meta/unslung-image.oe | 2 | ||||
| -rw-r--r-- | meta/unslung-standard-image.oe | 41 | ||||
| -rw-r--r-- | meta/unslung-switchbox-image.oe | 0 |
10 files changed, 42 insertions, 50 deletions
diff --git a/meta/nslu2-image.oe b/meta/nslu2-linksys-image.oe index e69de29bb2..e69de29bb2 100644 --- a/meta/nslu2-image.oe +++ b/meta/nslu2-linksys-image.oe diff --git a/meta/unslung-able-image.oe b/meta/unslung-able-image.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/meta/unslung-able-image.oe diff --git a/meta/unslung-image-able.oe b/meta/unslung-image-able.oe deleted file mode 100644 index 45655028c1..0000000000 --- a/meta/unslung-image-able.oe +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE_BASENAME = "unslung-able" - -DEPENDS = "nslu2-unslung-kernel-able nslu2-unslung-ramdisk-able ${UNSLUNG_BASE_PACKAGES}" - -include unslung-image-base.oe diff --git a/meta/unslung-image-base.oe b/meta/unslung-image-base.oe deleted file mode 100644 index 294b0453ef..0000000000 --- a/meta/unslung-image-base.oe +++ /dev/null @@ -1,29 +0,0 @@ -IMAGE_LINGUAS = "" -USE_DEVFS = "1" - -UNSLUNG_BASE_PACKAGES = "slingbox ipkg wget" - -IPKG_INSTALL = "${UNSLUNG_BASE_PACKAGES}" - -DEPENDS ?= "virtual/kernel nslu2-unslung-ramdisk ${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 deleted file mode 100644 index acbcd0a6b2..0000000000 --- a/meta/unslung-image-ext3flash.oe +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE_BASENAME = "unslung-ext3flash" - -DEPENDS = "nslu2-unslung-kernel-ext3flash nslu2-unslung-ramdisk-ext3flash ${UNSLUNG_BASE_PACKAGES}" - -include unslung-image-base.oe diff --git a/meta/unslung-image-standard.oe b/meta/unslung-image-standard.oe deleted file mode 100644 index b75632b254..0000000000 --- a/meta/unslung-image-standard.oe +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE_BASENAME = "unslung-standard" - -DEPENDS = "nslu2-unslung-kernel-standard nslu2-unslung-ramdisk-standard ${UNSLUNG_BASE_PACKAGES}" - -include unslung-image-base.oe diff --git a/meta/unslung-image-vfatdisk2.oe b/meta/unslung-image-vfatdisk2.oe deleted file mode 100644 index 11b3badf09..0000000000 --- a/meta/unslung-image-vfatdisk2.oe +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE_BASENAME = "unslung-vfatdisk2" - -DEPENDS = "nslu2-unslung-kernel-vfatdisk2 nslu2-unslung-ramdisk-vfatdisk2 ${UNSLUNG_BASE_PACKAGES}" - -include unslung-image-base.oe diff --git a/meta/unslung-image.oe b/meta/unslung-image.oe index c162c99b4d..924dff024d 100644 --- a/meta/unslung-image.oe +++ b/meta/unslung-image.oe @@ -1 +1 @@ -DEPENDS = "unslung-image-standard unslung-image-ext3flash unslung-image-vfatdisk2 unslung-image-able" +DEPENDS = "unslung-switchbox-image unslung-standard-image unslung-able-image" diff --git a/meta/unslung-standard-image.oe b/meta/unslung-standard-image.oe new file mode 100644 index 0000000000..6af8c6b97d --- /dev/null +++ b/meta/unslung-standard-image.oe @@ -0,0 +1,41 @@ +PR = "r1" + +IMAGE_LINGUAS = "" +USE_DEVFS = "1" + +UNSLUNG_BASE_DEPENDS = "slingbox ipkg wget" +UNSLUNG_BASE_PACKAGES = "slingbox ipkg wget" + +IMAGE_VARIANT ?= "standard" + +export IMAGE_BASENAME = "unslung-${IMAGE_VARIANT}" + +IPKG_INSTALL = "unslung-${IMAGE_VARIANT}-ramdisk \ + ${UNSLUNG_BASE_PACKAGES} ${UNSLUNG_EXTRA_PACKAGES}" + +DEPENDS = "unslung-${IMAGE_VARIANT}-kernel unslung-${IMAGE_VARIANT}-ramdisk \ + ${UNSLUNG_BASE_DEPENDS} ${UNSLUNG_EXTRA_DEPENDS}" + +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/* + +} diff --git a/meta/unslung-switchbox-image.oe b/meta/unslung-switchbox-image.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/meta/unslung-switchbox-image.oe |