[oe-commits] org.oe.dev merge of '36099db59bdf61dc5e1f93d3d874817fa38998dd'

[oe commit]

merge of '36099db59bdf61dc5e1f93d3d874817fa38998dd'
     and '82049ea686b5481d9f668eb2bd3c82e3782765e3'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 560272f1387656da43074f0bc75c28bee833d90e
ViewMTN: http://monotone.openembedded.org/revision/info/560272f1387656da43074f0bc75c28bee833d90e
Files:
1
packages/images/nslu2-minimal-image.bb
packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
packages/dtc/dtc-native_1.0.0.bb
Diffs:

#
# mt diff -r36099db59bdf61dc5e1f93d3d874817fa38998dd -r560272f1387656da43074f0bc75c28bee833d90e
#
# 
# 
# patch "packages/images/nslu2-minimal-image.bb"
#  from [b79cc878de38e428c269688f55fbd183cf6081c6]
#    to [c16184d9b2ea36248a6bf830e2682da55433caa5]
# 
# patch "packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb"
#  from [9461f60e0cada163ae639077c522bde341f9c8e7]
#    to [f6a5b6af3be5cad7ac5505774e30c5b13e1687b5]
# 
============================================================
--- packages/images/nslu2-minimal-image.bb	b79cc878de38e428c269688f55fbd183cf6081c6
+++ packages/images/nslu2-minimal-image.bb	c16184d9b2ea36248a6bf830e2682da55433caa5
@@ -1,3 +1,3 @@ require minimal-image.bb
 require minimal-image.bb
 
+inherit nslu2-image
-INHERIT += nslu2-image
============================================================
--- packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb	9461f60e0cada163ae639077c522bde341f9c8e7
+++ packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb	f6a5b6af3be5cad7ac5505774e30c5b13e1687b5
@@ -1,13 +1,13 @@ INHIBIT_DEFAULT_DEPS = "1"
 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


#
# mt diff -r82049ea686b5481d9f668eb2bd3c82e3782765e3 -r560272f1387656da43074f0bc75c28bee833d90e
#
# 
# 
# add_file "packages/dtc/dtc-native_1.0.0.bb"
#  content [a6cfb4d12568399421737e9db3bec79674a9c14a]
# 
============================================================
--- packages/dtc/dtc-native_1.0.0.bb	a6cfb4d12568399421737e9db3bec79674a9c14a
+++ packages/dtc/dtc-native_1.0.0.bb	a6cfb4d12568399421737e9db3bec79674a9c14a
@@ -0,0 +1,16 @@
+DESCRIPTION = "The Device Tree Compiler is a tool used to manipulate the Open-Firmware-like device tree used by PowerPC kernels."
+SECTION = "bootloader"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEFAULT_PREFERENCE = "1"
+
+SRC_URI = "http://www.jdl.com/pub/software/dtc-${PV}.tgz"
+
+S = "${WORKDIR}/dtc"
+
+inherit autotools native
+
+do_stage() {
+	install -m 755 dtc ${STAGING_BINDIR}/dtc
+}