[oe-commits] org.oe.dev uclibc: Use only uClibc.{distro, machine} for 0.9.29. Do not need require these for <0.9.29. This fixes uclibc-initial-0.9.28 builds.

[likewise commit]

uclibc: Use only uClibc.{distro,machine} for 0.9.29. Do not need require these for <0.9.29. This fixes uclibc-initial-0.9.28 builds.

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 5d1b115fdc0cd4dcc8356e8e2c5aaeca756b6e99
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5d1b115fdc0cd4dcc8356e8e2c5aaeca756b6e99
Files:
1
packages/uclibc/uclibc.inc
packages/uclibc/uclibc_0.9.29.bb
Diffs:

#
# mt diff -ra56ae794436b68a7b10f919d740c68a34d058188 -r5d1b115fdc0cd4dcc8356e8e2c5aaeca756b6e99
#
# 
# 
# patch "packages/uclibc/uclibc.inc"
#  from [c530f7a9ccaaa353ce8379ccd94d734dbdaf0fb5]
#    to [70cdb36f8087ed763c2c2837f43d4d34e86e9f1a]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [4bda37993205467de5abcd7241cba210aa54b426]
#    to [412903e32b7001b5d979f6263f6289e43dd816c2]
# 
============================================================
--- packages/uclibc/uclibc.inc	c530f7a9ccaaa353ce8379ccd94d734dbdaf0fb5
+++ packages/uclibc/uclibc.inc	70cdb36f8087ed763c2c2837f43d4d34e86e9f1a
@@ -57,9 +57,7 @@ SRC_URI = "${@['${UCLIBC_LOCALE_URI}', '
 UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}"
 
 SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
-	   file://uClibc.config \
-	   file://uClibc.machine \
-	   file://uClibc.distro"
+	   file://uClibc.config"
 
 UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}"
 UCLIBC_STAGE_PREFIX = "${STAGING_DIR}/${HOST_SYS}"
@@ -109,15 +107,25 @@ do_configure() {
 
 do_configure() {
 	rm -f ${S}/.config
-	# This stuff works like the standard OE OVERRIDES - keep the files
-	# in the same order as the default OVERRIDES (well, reverse order,
-	# because unlike overrides the last takes precedence)
-	cat ${WORKDIR}/uClibc.config ${WORKDIR}/uClibc.distro ${WORKDIR}/uClibc.machine >${S}/.config
 
+	# For uClibc 0.9.29, OpenEmbedded splits the uClibc.config in two parts:
+	# uClibc.machine and uClibc.distro. So, if they exist use them, otherwise
+	# use a uClibc.config
+	if [ -f ${WORKDIR}/uClibc.machine -a -f ${WORKDIR}/uClibc.distro ]; then
+		echo "### uClibc.machine ###" >${S}/merged.config
+		cat ${WORKDIR}/uClibc.machine >>${S}/merged.config
+		echo "### uClibc.distro ###" >>${S}/merged.config
+		cat ${WORKDIR}/uClibc.distro >>${S}/merged.config
+	else
+		echo "### uClibc.config ###" >${S}/merged.config
+		cat ${WORKDIR}/uClibc.config >>${S}/merged.config
+	fi
+	cp ${S}/merged.config ${S}/.config	
+
+	# Mangle the resulting .config depending on OE variables
 	perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak
 	perl -i -p -e '${configmangle}' ${S}/.config
 
-
    	sed -i -e '/CONFIG_ARM_EABI/d' ${S}/.config
 
         if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
============================================================
--- packages/uclibc/uclibc_0.9.29.bb	4bda37993205467de5abcd7241cba210aa54b426
+++ packages/uclibc/uclibc_0.9.29.bb	412903e32b7001b5d979f6263f6289e43dd816c2
@@ -14,6 +14,8 @@ PROVIDES += "virtual/${TARGET_PREFIX}lib
 
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 
+SRC_URI += "file://uClibc.machine file://uClibc.distro"
+
 #recent versions uclibc require real kernel headers
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"