summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-12-01 11:33:02 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-12-01 11:33:02 +0000
commit9022f01470fc0feb0d9d2fef846a97dfbe3d85e9 (patch)
tree5e28e7592fbaa193f9b2dc8fcce9d3b988deaab6
parent74370887caed1bbe586ea1c6a6159240f7c4e182 (diff)
parent2a5d20dbbf525dd1f9e41fcf05c7291ca3f20861 (diff)
merge of '36099db59bdf61dc5e1f93d3d874817fa38998dd'
and '82049ea686b5481d9f668eb2bd3c82e3782765e3'
-rw-r--r--packages/images/nslu2-minimal-image.bb2
-rw-r--r--packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb4
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/images/nslu2-minimal-image.bb b/packages/images/nslu2-minimal-image.bb
index db2312c613..c410707a31 100644
--- a/packages/images/nslu2-minimal-image.bb
+++ b/packages/images/nslu2-minimal-image.bb
@@ -1,3 +1,3 @@
require minimal-image.bb
-INHERIT += nslu2-image
+inherit nslu2-image
diff --git a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
index 6d13d092c1..52af4ad273 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
@@ -2,12 +2,12 @@ SECTION = "base"
PACKAGES = ""
LICENSE = "GPL"
INHIBIT_DEFAULT_DEPS = "1"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://nslu.sf.net/downloads/${PN}-${PV}.tar.bz2"
S = "${WORKDIR}/${PN}-${PV}"
-COMPATIBLE_MACHINE = "nslu2"
+COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
do_compile () {
install -d ${STAGING_LIBDIR}/nslu2-binaries