Patchwork Best way to update gnu-config?

login
register
mail settings
Submitter Marcin Juszkiewicz
Date Sept. 18, 2012, 8:58 a.m.
Message ID <505837BA.2040305@linaro.org>
Download mbox | patch
Permalink /patch/36707/
State New
Headers show

Comments

Marcin Juszkiewicz - Sept. 18, 2012, 8:58 a.m.
I am working on meta-aarch64 layer to add 64-bit ARM support.

For that I have to update gnu-config to newer version. Currently I am
using gnu-config_git.bbappend to move to 20120814 one. OE-Core is using
tarball prepared by Yocto Project so update is not so easy for outside
developer.

Attached are files which I am using (including updated uclibc patch).
Please reply with information how I can get it fully merged.
LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=b79a4663475f4d724846463277817e0d"

SRCREV = "062587eaa891396c936555ae51f7e77eeb71a5fe"
PV = "20120814+git${SRCPV}"
PR = "r0"

SRC_URI = "git://git.sv.gnu.org/config.git;protocol=git \
           file://config-guess-uclibc.patch \
           file://gnu-configize.in"

DEFAULT_PREFERENCE = "1"
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
Richard Purdie - Sept. 18, 2012, 9:08 a.m.
On Tue, 2012-09-18 at 10:58 +0200, Marcin Juszkiewicz wrote:
> I am working on meta-aarch64 layer to add 64-bit ARM support.
> 
> For that I have to update gnu-config to newer version. Currently I am
> using gnu-config_git.bbappend to move to 20120814 one. OE-Core is using
> tarball prepared by Yocto Project so update is not so easy for outside
> developer.
> 
> Attached are files which I am using (including updated uclibc patch).
> Please reply with information how I can get it fully merged.

The trouble was that upstream was in cvs. It was the only reason we
still had a dependency on cvs and we decided we wanted to kill it which
isn't something I regret.

Can you share a tarball of the updated (unpatched) upstream version and
we'll put it into place alongside the other tarball on the server.
Michael (cc'd) should be able to do this. Once that is done you should
be able to send a patch as usual to update to the new version.

I appreciate this is a pain but a dependency on cvs is worse IMO ;-).

Cheers,

Richard
Marcin Juszkiewicz - Sept. 18, 2012, 9:29 a.m.
W dniu 18.09.2012 11:08, Richard Purdie pisze:

> The trouble was that upstream was in cvs. It was the only reason we
> still had a dependency on cvs and we decided we wanted to kill it which
> isn't something I regret.

There is git mirror hosted on gnu.org servers which can be used instead
of cvs. OE-Core already has git-native.

> Can you share a tarball of the updated (unpatched) upstream version and
> we'll put it into place alongside the other tarball on the server.

http://people.linaro.org/~hrw/aarch64/gnu-config-20120814.tar.bz2

11:29 hrw@puchatek$ sha256sum gnu-config-20120814.tar.bz2
44f99a8e76f3e8e4fec0bb5ad4762f8e44366168554ce66cb85afbe2ed3efd8b
gnu-config-20120814.tar.bz2

> Michael (cc'd) should be able to do this. Once that is done you should
> be able to send a patch as usual to update to the new version.

Ok.
Richard Purdie - Sept. 18, 2012, 10:36 a.m.
On Tue, 2012-09-18 at 11:29 +0200, Marcin Juszkiewicz wrote:
> W dniu 18.09.2012 11:08, Richard Purdie pisze:
> 
> > The trouble was that upstream was in cvs. It was the only reason we
> > still had a dependency on cvs and we decided we wanted to kill it which
> > isn't something I regret.
> 
> There is git mirror hosted on gnu.org servers which can be used instead
> of cvs. OE-Core already has git-native.

I remember the problem now, this was a circular dependency nightmare
(git-native depends on gnu-config-native and vice versa). 

> > Can you share a tarball of the updated (unpatched) upstream version and
> > we'll put it into place alongside the other tarball on the server.
> 
> http://people.linaro.org/~hrw/aarch64/gnu-config-20120814.tar.bz2
> 
> 11:29 hrw@puchatek$ sha256sum gnu-config-20120814.tar.bz2
> 44f99a8e76f3e8e4fec0bb5ad4762f8e44366168554ce66cb85afbe2ed3efd8b
> gnu-config-20120814.tar.bz2
>
> > Michael (cc'd) should be able to do this. Once that is done you should
> > be able to send a patch as usual to update to the new version.
> 
> Ok.

Thanks, Michael should be able to take care of this later today (he's US
based).

Cheers,

Richard
Marcin Juszkiewicz - Oct. 3, 2012, 2:51 p.m.
W dniu 18.09.2012 11:36, Richard Purdie pisze:
> On Tue, 2012-09-18 at 11:29 +0200, Marcin Juszkiewicz wrote:
>> W dniu 18.09.2012 11:08, Richard Purdie pisze:
>>
>>> The trouble was that upstream was in cvs. It was the only reason we
>>> still had a dependency on cvs and we decided we wanted to kill it which
>>> isn't something I regret.
>>
>> There is git mirror hosted on gnu.org servers which can be used instead
>> of cvs. OE-Core already has git-native.
>
> I remember the problem now, this was a circular dependency nightmare
> (git-native depends on gnu-config-native and vice versa).
>
>>> Can you share a tarball of the updated (unpatched) upstream version and
>>> we'll put it into place alongside the other tarball on the server.
>>
>> http://people.linaro.org/~hrw/aarch64/gnu-config-20120814.tar.bz2
>>
>> 11:29 hrw@puchatek$ sha256sum gnu-config-20120814.tar.bz2
>> 44f99a8e76f3e8e4fec0bb5ad4762f8e44366168554ce66cb85afbe2ed3efd8b
>> gnu-config-20120814.tar.bz2
>>
>>> Michael (cc'd) should be able to do this. Once that is done you should
>>> be able to send a patch as usual to update to the new version.
>>
>> Ok.
>
> Thanks, Michael should be able to take care of this later today (he's US
> based).

Michael: any update on it?
Michael Halstead - Oct. 3, 2012, 5:24 p.m.
On 10/03/2012 07:51 AM, Marcin Juszkiewicz wrote:
> W dniu 18.09.2012 11:36, Richard Purdie pisze:
>> On Tue, 2012-09-18 at 11:29 +0200, Marcin Juszkiewicz wrote:
>>> W dniu 18.09.2012 11:08, Richard Purdie pisze:
>>>
>>>> The trouble was that upstream was in cvs. It was the only reason we
>>>> still had a dependency on cvs and we decided we wanted to kill it
>>>> which
>>>> isn't something I regret.
>>>
>>> There is git mirror hosted on gnu.org servers which can be used instead
>>> of cvs. OE-Core already has git-native.
>>
>> I remember the problem now, this was a circular dependency nightmare
>> (git-native depends on gnu-config-native and vice versa).
>>
>>>> Can you share a tarball of the updated (unpatched) upstream version
>>>> and
>>>> we'll put it into place alongside the other tarball on the server.
>>>
>>> http://people.linaro.org/~hrw/aarch64/gnu-config-20120814.tar.bz2
>>>
>>> 11:29 hrw@puchatek$ sha256sum gnu-config-20120814.tar.bz2
>>> 44f99a8e76f3e8e4fec0bb5ad4762f8e44366168554ce66cb85afbe2ed3efd8b
>>> gnu-config-20120814.tar.bz2
>>>
>>>> Michael (cc'd) should be able to do this. Once that is done you should
>>>> be able to send a patch as usual to update to the new version.
>>>
>>> Ok.
>>
>> Thanks, Michael should be able to take care of this later today (he's US
>> based).
>
> Michael: any update on it?
>
I'm sorry this is a case of bad e-mail filtering.

I've added this tarball at
http://downloads.yoctoproject.org/releases/gnu-config/ is that correct?

Michael Halstead
Yocto Project / Sys Admin
Marcin Juszkiewicz - Oct. 3, 2012, 5:25 p.m.
W dniu 03.10.2012 18:24, Michael Halstead pisze:
> On 10/03/2012 07:51 AM, Marcin Juszkiewicz wrote:
>> W dniu 18.09.2012 11:36, Richard Purdie pisze:

>>> Thanks, Michael should be able to take care of this later today (he's US
>>> based).
>>
>> Michael: any update on it?
>>
> I'm sorry this is a case of bad e-mail filtering.
>
> I've added this tarball at
> http://downloads.yoctoproject.org/releases/gnu-config/ is that correct?

Thanks a lot - that was it.

Patch

Upstream-Status: Pending

Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-guess-uclibc.patch.

updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand)
updated to 20080123 by Nitin A Kamble (by hand)
updated to 20111001 by Saul Wold (by hand)
updated to 20120818 by Marcin 'Hrw' Juszkiewicz (by hand)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

---
 config.guess |   67 +++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 40 insertions(+), 27 deletions(-)

--- git.orig/config.guess
+++ git/config.guess
@@ -138,6 +138,19 @@  UNAME_RELEASE=`(uname -r) 2>/dev/null` |
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+# Detect uclibc systems.
+
+LIBC="gnu"
+if [ -f /usr/include/bits/uClibc_config.h ]
+then
+	LIBC=uclibc
+	if [ -n `grep "#define __UCLIBC_CONFIG_VERSION__" /usr/include/bits/uClibc_config.h` ]
+	then
+		UCLIBC_SUBVER=`sed -n "/#define __UCLIBC_CONFIG_VERSION__ /s///p" /usr/include/bits/uClibc_config.h`
+		LIBC=$LIBC$UCLIBC_SUBVER
+	fi
+fi
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -886,15 +899,15 @@  EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
@@ -906,19 +919,19 @@  EOF
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -932,13 +945,13 @@  EOF
 	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -957,54 +970,54 @@  EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
     or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.