Merge http://nslu2-linux.bkbits.net/packages

into handhelds.org:/home/kergoth/code/packages

2004/11/03 09:55:16+10:30 (none)!rwhitby
Added FILESPATH to unslung ramdisk variants

2004/11/03 09:48:09+10:30 (none)!rwhitby
Added unslung ramdisk variants to respective images

2004/11/03 09:39:54+10:30 (none)!rwhitby
Moved nslu2-unslung-ramdisk from BASE_PACKAGES to DEPENDS so it can be overridden.

2004/11/03 09:35:01+10:30 (none)!rwhitby
Unslung: fixed unslung-image.oe due to image name changes

BKrev: 4188175dfRaC0iyq0dUuqfINarVOqw

diff --git a/meta/unslung-image-able.oe b/meta/unslung-image-able.oe
index e69de29..4565502 100644 (file)
--- a/meta/unslung-image-able.oe
+++ b/meta/unslung-image-able.oe
@@ -0,0 +1,5 @@
+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
index 061b77c..294b045 100644 (file)
--- a/meta/unslung-image-base.oe
+++ b/meta/unslung-image-base.oe
@@ -1,11 +1,11 @@
 IMAGE_LINGUAS = ""
 USE_DEVFS = "1"
 
-UNSLUNG_BASE_PACKAGES = "nslu2-unslung-ramdisk slingbox ipkg wget"
+UNSLUNG_BASE_PACKAGES = "slingbox ipkg wget"
 
 IPKG_INSTALL = "${UNSLUNG_BASE_PACKAGES}"
 
-DEPENDS ?= "virtual/kernel ${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')}"

diff --git a/meta/unslung-image-ext3flash.oe b/meta/unslung-image-ext3flash.oe
index e69de29..acbcd0a 100644 (file)
--- a/meta/unslung-image-ext3flash.oe
+++ b/meta/unslung-image-ext3flash.oe
@@ -0,0 +1,5 @@
+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
index e69de29..b75632b 100644 (file)
--- a/meta/unslung-image-standard.oe
+++ b/meta/unslung-image-standard.oe
@@ -0,0 +1,5 @@
+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-image.oe b/meta/unslung-image-vfatdisk2-image.oe
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/meta/unslung-image-vfatdisk2.oe b/meta/unslung-image-vfatdisk2.oe
index e69de29..11b3bad 100644 (file)
--- a/meta/unslung-image-vfatdisk2.oe
+++ b/meta/unslung-image-vfatdisk2.oe
@@ -0,0 +1,5 @@
+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 f17a295..c162c99 100644 (file)
--- a/meta/unslung-image.oe
+++ b/meta/unslung-image.oe
@@ -1 +1 @@
-DEPENDS = "unslung-standard-image unslung-ext3flash-image unslung-vfatdisk2-image unslung-able-image"
+DEPENDS = "unslung-image-standard unslung-image-ext3flash unslung-image-vfatdisk2 unslung-image-able"

diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk-able_2.3r25.oe b/nslu2-binary-only/nslu2-unslung-ramdisk-able_2.3r25.oe
index e69de29..7491cb9 100644 (file)
--- a/nslu2-binary-only/nslu2-unslung-ramdisk-able_2.3r25.oe
+++ b/nslu2-binary-only/nslu2-unslung-ramdisk-able_2.3r25.oe
@@ -0,0 +1,8 @@
+UNSLUNG_VARIANT = "able"
+
+# Add overlays and patches to the standard ramdisk here
+# SRC_URI += "file://ipkg.conf"
+
+include nslu2-unslung-ramdisk_2.3r25.oe
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/nslu2-unslung-ramdisk/able', '${FILE_DIRNAME}/nslu2-unslung-ramdisk', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"

diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk-ext3flash_2.3r25.oe b/nslu2-binary-only/nslu2-unslung-ramdisk-ext3flash_2.3r25.oe
index e69de29..08bef73 100644 (file)
--- a/nslu2-binary-only/nslu2-unslung-ramdisk-ext3flash_2.3r25.oe
+++ b/nslu2-binary-only/nslu2-unslung-ramdisk-ext3flash_2.3r25.oe
@@ -0,0 +1,8 @@
+UNSLUNG_VARIANT = "ext3flash"
+
+# Add overlays and patches to the standard ramdisk here
+# SRC_URI += "file://ipkg.conf"
+
+include nslu2-unslung-ramdisk_2.3r25.oe
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/nslu2-unslung-ramdisk/ext3flash', '${FILE_DIRNAME}/nslu2-unslung-ramdisk', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"

diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk-standard_2.3r25.oe b/nslu2-binary-only/nslu2-unslung-ramdisk-standard_2.3r25.oe
index e69de29..4645cae 100644 (file)
--- a/nslu2-binary-only/nslu2-unslung-ramdisk-standard_2.3r25.oe
+++ b/nslu2-binary-only/nslu2-unslung-ramdisk-standard_2.3r25.oe
@@ -0,0 +1,8 @@
+UNSLUNG_VARIANT = "standard"
+
+# Add overlays and patches to the standard ramdisk here
+# SRC_URI += "file://ipkg.conf"
+
+include nslu2-unslung-ramdisk_2.3r25.oe
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/nslu2-unslung-ramdisk/standard', '${FILE_DIRNAME}/nslu2-unslung-ramdisk', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"

diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk-vfatdisk2_2.3r25.oe b/nslu2-binary-only/nslu2-unslung-ramdisk-vfatdisk2_2.3r25.oe
index e69de29..ee31cf3 100644 (file)
--- a/nslu2-binary-only/nslu2-unslung-ramdisk-vfatdisk2_2.3r25.oe
+++ b/nslu2-binary-only/nslu2-unslung-ramdisk-vfatdisk2_2.3r25.oe
@@ -0,0 +1,8 @@
+UNSLUNG_VARIANT = "vfatdisk2"
+
+# Add overlays and patches to the standard ramdisk here
+# SRC_URI += "file://ipkg.conf"
+
+include nslu2-unslung-ramdisk_2.3r25.oe
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/nslu2-unslung-ramdisk/vfatdisk2', '${FILE_DIRNAME}/nslu2-unslung-ramdisk', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"