[oe-commits] org.oe.dev mtx-3a.conf, nylon-image-mini.bb: fixes to not conflict with the recent bitbake versions.

[MartinDietze commit]

mtx-3a.conf, nylon-image-mini.bb: fixes to not conflict with the recent bitbake versions.

Author: MartinDietze at openembedded.org
Branch: org.openembedded.dev
Revision: 30f615c65861e2aeac9bcd31565276b2d5929532
ViewMTN: http://monotone.openembedded.org/revision.psp?id=30f615c65861e2aeac9bcd31565276b2d5929532
Files:
1
conf/machine/mtx-3a.conf
packages/images/nylon-image-mini.bb
Diffs:

#
# mt diff -ra1a53de4dc6cdab69af325b6a2615e1c4b40caad -r30f615c65861e2aeac9bcd31565276b2d5929532
#
# 
# 
# patch "conf/machine/mtx-3a.conf"
#  from [d1f7d5a166503cdd2bcc767495e83cdb8a51323d]
#    to [aa378e002b231e92deaa857037d424a3ea903aaf]
# 
# patch "packages/images/nylon-image-mini.bb"
#  from [4cbffe3c0489c132c323f73eb625ed587c073edb]
#    to [fa47a8388a5cdf939a7afd5a103890b2aee7dc14]
# 
============================================================
--- conf/machine/mtx-3a.conf	d1f7d5a166503cdd2bcc767495e83cdb8a51323d
+++ conf/machine/mtx-3a.conf	aa378e002b231e92deaa857037d424a3ea903aaf
@@ -1,9 +1,9 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine - the orange marvell box
 #@NAME: 4G Systems mtx-3a
 #@DESCRIPTION: Machine configuration for the mtx-3a 
 
 TARGET_ARCH = "arm"
-#PACKAGE_ARCHS = "all arm ${MACHINE}"
+PACKAGE_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3a"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"  
 TARGET_CC_ARCH = "-march=armv5te"
============================================================
--- packages/images/nylon-image-mini.bb	4cbffe3c0489c132c323f73eb625ed587c073edb
+++ packages/images/nylon-image-mini.bb	fa47a8388a5cdf939a7afd5a103890b2aee7dc14
@@ -1,5 +1,8 @@ export IMAGE_BASENAME = "nylon-mini"
 export IMAGE_BASENAME = "nylon-mini"
 
+inherit image
+LICENSE = "MIT"
+
 NYLON_BASE = "base-files base-passwd busybox \
 	dropbear \
 	miniinit \
@@ -8,12 +11,9 @@ NYLON_BASE = "base-files base-passwd bus
 	netbase \
 	wireless-tools"
 
-RDEPENDS = "kernel \
+RDEPENDS += "kernel \
 	${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}"
 
 export PACKAGE_INSTALL = "${RDEPENDS}"
 
 IMAGE_LINGUAS = ""
-
-inherit image
-LICENSE = "MIT"