Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

84 files changed, 4386 insertions, 110 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index b50bc8667c..93a76aa30f 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -157,6 +157,23 @@ def base_both_contain(variable1, variable2, checkvalue, d):
 
 DEPENDS_prepend="${@base_dep_prepend(d)} "
 
+# Returns PN with various suffixes removed
+# or PN if no matching suffix was found.
+def base_package_name(d):
+  import bb;
+
+  pn = bb.data.getVar('PN', d, 1)
+  if pn.endswith("-native"):
+		pn = pn[0:-7]
+  elif pn.endswith("-cross"):
+		pn = pn[0:-6]
+  elif pn.endswith("-initial"):
+		pn = pn[0:-8]
+  elif pn.endswith("-intermediate"):
+		pn = pn[0:-13]
+
+  return pn
+
 def base_set_filespath(path, d):
 	import os, bb
 	filespath = []
@@ -167,7 +184,7 @@ def base_set_filespath(path, d):
 			filespath.append(os.path.join(p, o))
 	return ":".join(filespath)
 
-FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
+FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/${BP}", "${FILE_DIRNAME}/${BPN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
 
 def oe_filter(f, str, d):
 	from re import match
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index eced939ef0..06c3170544 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -10,6 +10,9 @@
 
 inherit java
 
+# use java_stage for native packages
+JAVA_NATIVE_STAGE_INSTALL = "1"
+
 def java_package_name(d):
   import bb;
 
@@ -25,18 +28,6 @@ def java_package_name(d):
 
   return pre + pn + post
 
-def java_base_package_name(d):
-  import bb;
-
-  pre=""
-  post=""
-
-  pn = bb.data.getVar('PN', d, 1)
-  if pn.endswith("-native"):
-		pn = pn[0:-7]
-
-  return pn
-
 JPN ?= "${@java_package_name(d)}"
 
 DEPENDS_prepend = "virtual/javac-native fastjar-native "
@@ -47,12 +38,6 @@ PACKAGE_ARCH_${JPN} = "all"
 
 FILES_${JPN} = "${datadir_java}"
 
-# Base package name
-# Automatically derives "foo" from "foo-native"
-BPN ?= ""${@java_base_package_name(d)}""
-
-BP ?= "${BPN}-${PV}"
-
 # File name of the libraries' main Jar file
 JARFILENAME = "${BP}.jar"
 
diff --git a/classes/java.bbclass b/classes/java.bbclass
index 32415d5800..7b67bcd510 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -84,32 +84,32 @@ oe_makeclasspath() {
   #
   # oe_makeclasspath cp foo baz bar
   # Stores ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar
-	# in variable "cp".
+  # in variable "cp".
   #
   # oe_makeclasspath bootcp -s foo baz bar
   # Stores ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar
-	# in variable "bootcp".
-	# 
+  # in variable "bootcp".
+  # 
   # Provide the -s at the beginning otherwise strange things happen.
-	# If -s is given the function checks whether the requested jar file exists
-	#	and exits with an error message if it cannot be found.
-	#
+  # If -s is given the function checks whether the requested jar file exists
+  #	and exits with an error message if it cannot be found.
+  #
   dir=${datadir_java}
-	classpath=
-	delimiter=
-	retval=$1
+  classpath=
+  delimiter=
+  retval=$1
 
-	shift
+  shift
 
   while [ "$#" -gt 0 ]; do
     case "$1" in
     -s)
-			# take jar files from native staging if this is a -native recipe
-			if [ ${PACKAGE_ARCH} = ${BUILD_ARCH} ]; then
+		# take jar files from native staging if this is a -native recipe
+		if [ ${PACKAGE_ARCH} = ${BUILD_ARCH} ]; then
 	      dir=${STAGING_DATADIR_JAVA_NATIVE}
-			else
+		else
 	      dir=${STAGING_DATADIR_JAVA}
-			fi
+		fi
       ;;
     -*)
       oefatal "oe_makeclasspath: unknown option: $1"
@@ -117,9 +117,9 @@ oe_makeclasspath() {
     *)
       file=$dir/$1.jar
 
-			if [ -z "$dir" -a ! -f $file ]; then
-				oefatal "oe_makeclasspath: Jar file for '$1' not found at $file"
-			fi
+	  if [ -z "$dir" -a ! -f $file ]; then
+	    oefatal "oe_makeclasspath: Jar file for '$1' not found at $file"
+	  fi
 
       classpath=$classpath$delimiter$file
       delimiter=":"
@@ -128,7 +128,7 @@ oe_makeclasspath() {
     shift
   done
 
-	eval $retval="$classpath"
+  eval $retval="$classpath"
 }
 
 # Creates a simple wrapper script for your Java program.
diff --git a/classes/native.bbclass b/classes/native.bbclass
index 8f79935040..61048b6b14 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -80,11 +80,14 @@ export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
 do_stage () {
 	if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ]
 	then
-		if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1" ]
+		if [ "${JAVA_NATIVE_STAGE_INSTALL}" = "1" ]
+		then
+			java_stage
+		elif [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" = "1" ]
 		then
-			oe_runmake install
-		else
 			autotools_stage_all
+		else
+			oe_runmake install
 		fi
 	fi
 }
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 071c1efdc9..93064b0a30 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -143,10 +143,11 @@ EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}"
 DEBPV = "${EXTENDPEVER}${PV}-${PR}"
 P = "${PN}-${PV}"
 
-##################################################################
-# Distro default 
-##################################################################
-DISTRO_PR ?= ""
+# Base package name
+# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
+# otherwise it is the same as PN and P
+BPN = "${@base_package_name(d)}"
+BP = "${BPN}-${PV}"
 
 # Package info.
 
@@ -217,7 +218,7 @@ FILES_${PN}-locale = "${datadir}/locale"
 export MANIFEST = "${FILESDIR}/manifest"
 
 FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}"
-FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
 
 ##################################################################
@@ -237,7 +238,7 @@ STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}"
 WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}"
 T = "${WORKDIR}/temp"
 D = "${WORKDIR}/image"
-S = "${WORKDIR}/${P}"
+S = "${WORKDIR}/${BP}"
 B = "${S}"
 
 STAGING_DIR = "${TMPDIR}/staging"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index c8bebc7fb3..d3fa48e520 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -4434,6 +4434,10 @@ sha256=176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac
 md5=85bb8ee345fc41c218de19dda0164806
 sha256=90825b05b675890bd405767a973d3c8c90eae36d22a7be6307e07a2e3c760d89
 
+[http://downloads.sourceforge.net/giflib/giflib-4.1.6.tar.bz2]
+md5=7125644155ae6ad33dbc9fc15a14735f
+sha256=e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed
+
 [http://downloads.sourceforge.net/gift/gift-0.11.4.tar.bz2]
 md5=decc82159c6723be999b1306a808077f
 sha256=68149059b807b2fac505e376c18320e64104fbe0190e359f98059e73a63693dc
@@ -7462,6 +7466,10 @@ sha256=f532fcd61b012379d3258196a8588fd9d51ecdfb5c795485ab2f78d439b103b4
 md5=b6d7ca9e9740286f0ce918da9fb8438b
 sha256=0ee6a3caee4812827b8e167d4a07dbf859cb08a00a20f09568c3baae379d6ce8
 
+[http://downloads.sourceforge.net/lesstif/lesstif-0.95.0.tar.bz2]
+md5=ab895165c149d7f95843c7584b1c7ad4
+sha256=2a6f20d3bd525e6066ba2be22d8a47bf4bcd0425
+
 [ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/lftp-3.5.1.tar.bz2]
 md5=c6d48782cdad4759000bf7cd24555723
 sha256=463f0b46ce3a0fc09ef9ad7a5429959034d50a1eadbed5dfeae36c25dca31130
@@ -15486,6 +15494,10 @@ sha256=cb4909d8753dff7f6ac90a62a61ed1ae68e49ead2dbc60c22673c55bb0e14a36
 md5=96830836f64edbb12c248eb84e6b0d18
 sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305
 
+[http://downloads.sourceforge.net/wesnoth/wesnoth-1.4.5.tar.bz2]
+md5=09b7b76d4a4eedf502f38df9d551d827
+sha256=6abc3f0c9bee10dfe890c3691542ecae053908da
+
 [ftp://ftp.gnu.org/gnu/wget/wget-1.9.1.tar.gz]
 md5=e6051f1e1487ec0ebfdbda72bedc70ad
 sha256=69044b87c517b986dbc17a5f7e4de430cb56e605330c19c6bb0d384d5c37e638
diff --git a/conf/machine/acern30.conf b/conf/machine/acern30.conf
index 22718b806e..add59a4f45 100644
--- a/conf/machine/acern30.conf
+++ b/conf/machine/acern30.conf
@@ -6,7 +6,6 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
 
 # Samsung S3C2xxx CPU
 require conf/machine/include/tune-arm920t.inc
diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf
index 349dd8eddb..e1ad289b40 100644
--- a/conf/machine/amsdelta.conf
+++ b/conf/machine/amsdelta.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Amstrad E3
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"
diff --git a/conf/machine/asus620.conf b/conf/machine/asus620.conf
index ef7e8a2a39..8ec0d9a999 100644
--- a/conf/machine/asus620.conf
+++ b/conf/machine/asus620.conf
@@ -6,7 +6,6 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
 require conf/machine/include/tune-xscale.inc
 
diff --git a/conf/machine/asus730.conf b/conf/machine/asus730.conf
index 814641df8f..d4712032db 100644
--- a/conf/machine/asus730.conf
+++ b/conf/machine/asus730.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+PACKAGE_EXTRA_ARCHS = "iwmmxt"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/at91-l9260.conf b/conf/machine/at91-l9260.conf
index 16d0705a24..f95fb2da56 100644
--- a/conf/machine/at91-l9260.conf
+++ b/conf/machine/at91-l9260.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine.inciguration for the AT91SAM9260 development board with a at91sam9260 processor
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.25"
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index ba0c9f9a70..59ef577480 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index 3b9d5188f6..570ff165f7 100644
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine.inciguration for the at91sam9261ek development board with a at91sam9261 processor
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index 95c7626a63..9fd34f95a0 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the at91sam9263ek development board with a at91sam9263 processor
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf
index b119a24359..6247c8322c 100644
--- a/conf/machine/aximx50.conf
+++ b/conf/machine/aximx50.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
+PACKAGE_EXTRA_ARCHS = " iwmmxt "
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.inc