uclibc: Pass ARCH=<TARGET_ARCH>" on make commandline.

Like linux kernel Git version of uclibc mandates that ARCH is passed
down from make instead of being computed magically. This will be
there in next release 0.9.31 of uclibc. Defining it on make
invocation for older releases is no harm.

Also move uclibc to use INC_PR

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Henning Heinold <heinold@inf.fu-berlin.de>

diff --git a/recipes/uclibc/bfin-uclibc_svn.bb b/recipes/uclibc/bfin-uclibc_svn.bb
index 93052452c569d86af71339543232fcc45f69664a..e5123ad56e60720c9eeeae31cb691bf85991673d 100644 (file)
--- a/recipes/uclibc/bfin-uclibc_svn.bb
+++ b/recipes/uclibc/bfin-uclibc_svn.bb
@@ -7,11 +7,10 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r5"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
 
 require uclibc.inc
-
+PR = "${INC_PR}.0"
 PROVIDES_append_bfin = " virtual/${TARGET_PREFIX}libc-for-gcc "
 
 #recent versions uclibc require real kernel headers

diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc
index 3c723664d323fd0588f9d546290c728635179675..2ed7d82378ee071dde5364f98a96b12a197f0810 100644 (file)
--- a/recipes/uclibc/uclibc.inc
+++ b/recipes/uclibc/uclibc.inc
@@ -2,6 +2,7 @@ DESCRIPTION = "C library for embedded systems"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "required"
+INC_PR = "r32"
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
 # and our build is not a uclibc one, and we skip a glibc one if our build
@@ -79,7 +80,8 @@ UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}"
 OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}' \
                'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'"
 EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' \
-               'HOSTCFLAGS=-I${STAGING_INCDIR_NATIVE}'"
+               'HOSTCFLAGS=-I${STAGING_INCDIR_NATIVE}' \
+               ARCH=`grep TARGET_ARCH ${S}/.config|sed -e 's/TARGET_ARCH=//g'`"
 EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}"
 
 KERNEL_SOURCE = "${STAGING_INCDIR}"

diff --git a/recipes/uclibc/uclibc_0.9.28.bb b/recipes/uclibc/uclibc_0.9.28.bb
index aef0cd802861acd84858d9f2d69914ec17c322ed..2e909399d30a871224f6c6f0d9eb3989c38018b9 100644 (file)
--- a/recipes/uclibc/uclibc_0.9.28.bb
+++ b/recipes/uclibc/uclibc_0.9.28.bb
@@ -1,6 +1,5 @@
-PR = "r18"
-
 require uclibc.inc
+PR = "${INC_PR}.0"
 
 # This is the correct KERNEL_SOURCE location, if the uClibc
 # fix_includes.sh script is run (see nokernelheader.patch below)

diff --git a/recipes/uclibc/uclibc_0.9.29.bb b/recipes/uclibc/uclibc_0.9.29.bb
index de98a637c942c1206adab84129f579ec4573cc12..1679ada8b738eaeae3ed3db1bd7e4e67d6d848ef 100644 (file)
--- a/recipes/uclibc/uclibc_0.9.29.bb
+++ b/recipes/uclibc/uclibc_0.9.29.bb
@@ -7,9 +7,9 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r31"
 
 require uclibc.inc
+PR = "${INC_PR}.0"
 
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 

diff --git a/recipes/uclibc/uclibc_0.9.30.1.bb b/recipes/uclibc/uclibc_0.9.30.1.bb
index 972b9576bd5753ba32fdb46b22dadba661082861..821e06e8bbf1cc60e5c1bca2ebad584d40ee531f 100644 (file)
--- a/recipes/uclibc/uclibc_0.9.30.1.bb
+++ b/recipes/uclibc/uclibc_0.9.30.1.bb
@@ -7,9 +7,9 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.30.1"
-PR = "r4"
 
 require uclibc.inc
+PR = "${INC_PR}.0"
 
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 

diff --git a/recipes/uclibc/uclibc_0.9.30.bb b/recipes/uclibc/uclibc_0.9.30.bb
index 4d58b8904e0604de3f6de95e83e3ebf952585e2b..2e18ab9fa58da569c7bb0c5e0251df1dcda59607 100644 (file)
--- a/recipes/uclibc/uclibc_0.9.30.bb
+++ b/recipes/uclibc/uclibc_0.9.30.bb
@@ -7,9 +7,9 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.30"
-PR = "r7"
 
 require uclibc.inc
+PR = "${INC_PR}.0"
 
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 

diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb
index 0fac211de24578c8b416ae392bcccc67c84418f0..cdc5ae14f4ae2a03a77e918a0be97943dfe6e526 100644 (file)
--- a/recipes/uclibc/uclibc_git.bb
+++ b/recipes/uclibc/uclibc_git.bb
@@ -9,13 +9,12 @@
 UCLIBC_BASE ?= "0.9.30"
 SRCREV="6625518cd6894338937a74ca6b9187b7b8167b03"
 PV = "${UCLIBC_BASE}+gitr${SRCREV}"
-PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
 
 require uclibc.inc
-
+PR = "${INC_PR}.0"
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 
 #recent versions uclibc require real kernel headers

diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb
index bdf7d9c49d79a69f9d15140421877e165293f941..afb634725649e3e6c42b2bc4fc6e0f9b93cc698d 100644 (file)
--- a/recipes/uclibc/uclibc_nptl.bb
+++ b/recipes/uclibc/uclibc_nptl.bb
@@ -9,12 +9,12 @@
 UCLIBC_BASE ?= "0.9.30"
 SRCREV="d57e6548d253a9efed91d72498aeda092fa265d2"
 PV = "${UCLIBC_BASE}+gitr${SRCREV}"
-PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
 
 require uclibc.inc
+PR = "${INC_PR}.0"
 
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"