From: Martin Dietze <di@fh-wedel.de>
Date: Fri, 27 Apr 2007 09:06:29 +0000 (+0000)
Subject: mtx-3a.conf, nylon-image-mini.bb: fixes to not conflict with the recent bitbake versions.
X-Git-Tag: Release-2010-05/1~8868^2~660^2~35
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d75046772500b479cbfaa0c199aa7ef069fdc7a;p=openembedded.git

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

diff --git a/conf/machine/mtx-3a.conf b/conf/machine/mtx-3a.conf
index 6f963d164e..000b200840 100644
--- a/conf/machine/mtx-3a.conf
+++ b/conf/machine/mtx-3a.conf
@@ -3,7 +3,7 @@
 #@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"
diff --git a/packages/images/nylon-image-mini.bb b/packages/images/nylon-image-mini.bb
index e6acd1f2dc..c0ed998449 100644
--- a/packages/images/nylon-image-mini.bb
+++ b/packages/images/nylon-image-mini.bb
@@ -1,5 +1,8 @@
 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 busybox \
 	netbase \
 	wireless-tools"
 
-RDEPENDS = "kernel \
+RDEPENDS += "kernel \
 	${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}"
 
 export PACKAGE_INSTALL = "${RDEPENDS}"
 
 IMAGE_LINGUAS = ""
-
-inherit image
-LICENSE = "MIT"