Consolidated Pull for 5/8/2011
cover Consolidated Pull for 5/8/2011
From: Saul Wold <[email protected]>
Richard,
Here is a batch of changes from last week.
This contains a fix for gnu-config that is a workaround for a Bernard Bug that we need to back port.
I have test built for x86, arm and the toolchains
Sau!
Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: sgw/stage
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Thanks,
Saul Wold <[email protected]>
---
Darren Hart (1):
u-boot: correct COPYING MD5SUM
Dexuan Cui (1):
gnu-config-native: add dependency on perl-native
Khem Raj (2):
conf/layer.conf: Use .= to append to BBPATH and += for BBFILES gettext.bbclass, bitbake.conf: Append nls options to EXTRA_OECONF
instead of +=
Koen Kooi (2):
git: make it work on the target
package.bbclass: convert unpackaged file message from 'info' to
'warn' so that it shows up on the console
Nitin A Kamble (8):
libpcre: update upstream status for patches patch-2.6.1: update patch upstream status
patch: update upstream status for patches
python-imaging: update upstream status for patches
subversion: update upstream status for patches
sat-solver: fix compilation issue with gcc 4.6.0 gcc-4.5.1: update upstream status of patches
binutils: update upstream status of patches
Saul Wold (2):
clutter-gst-1.4: Add missing patch
gtkhtml2, web: Sync version for API Change
Tom Rini (4):
gcc-package-target: Switch to TARGET_PREFIX in symlinks binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS sysstat.inc: Switch to inherit gettext bash.inc: Add bison-native to DEPENDS
meta/classes/gettext.bbclass | 6 +- meta/classes/package.bbclass | 4 +- meta/conf/bitbake.conf | 2 +- meta/conf/layer.conf | 5 +- meta/recipes-bsp/uboot/u-boot_git.bb | 4 +- .../binutils/binutils-2.21/110-arm-eabi-conf.patch | 2 + .../binutils-2.21/binutils-2.19.1-ld-sysroot.patch | 2 + .../binutils/binutils-2.21/binutils-poison.patch | 2 + .../binutils-uclibc-100-uclibc-conf.patch | 2 + meta/recipes-devtools/binutils/binutils.inc | 10 +- .../gcc/gcc-4.5.1/100-uclibc-conf.patch | 2 + .../gcc/gcc-4.5.1/103-uclibc-conf-noupstream.patch | 2 + .../gcc/gcc-4.5.1/200-uclibc-locale.patch | 2 + .../gcc/gcc-4.5.1/203-uclibc-locale-no__x.patch | 2 + .../gcc-4.5.1/204-uclibc-locale-wchar_fix.patch | 2 + .../gcc/gcc-4.5.1/205-uclibc-locale-update.patch | 2 + .../gcc/gcc-4.5.1/301-missing-execinfo_h.patch | 2 + .../gcc/gcc-4.5.1/302-c99-snprintf.patch | 2 + .../gcc/gcc-4.5.1/303-c99-complex-ugly-hack.patch | 2 + .../gcc/gcc-4.5.1/304-index_macro.patch | 2 + .../gcc-4.5.1/305-libmudflap-susv3-legacy.patch | 2 + .../gcc/gcc-4.5.1/306-libstdc++-namespace.patch | 2 + .../gcc/gcc-4.5.1/307-locale_facets.patch | 2 + .../gcc/gcc-4.5.1/602-sdk-libstdc++-includes.patch | 2 + .../recipes-devtools/gcc/gcc-4.5.1/64bithack.patch | 2 + .../gcc/gcc-4.5.1/740-sh-pr24836.patch | 2 + .../gcc/gcc-4.5.1/800-arm-bigendian.patch | 2 + .../gcc/gcc-4.5.1/904-flatten-switch-stmt-00.patch | 2 + .../gcc/gcc-4.5.1/arm-bswapsi2.patch | 2 + .../gcc/gcc-4.5.1/arm-nolibfloat.patch | 2 + .../gcc/gcc-4.5.1/arm-softfloat.patch | 2 + meta/recipes-devtools/gcc/gcc-package-target.inc | 10 +- meta/recipes-devtools/git/git.inc | 32 +++++- meta/recipes-devtools/git/git_1.7.4.3.bb | 2 +- .../gnu-config/config-guess-uclibc.patch | 2 + .../gnu-config/gnu-config_20080123.bb | 6 +- .../patch/patch-2.6.1/global-reject-file.diff | 2 + meta/recipes-devtools/patch/patch/debian.patch | 2 + .../patch/patch/global-reject-file.diff | 2 + meta/recipes-devtools/patch/patch/install.patch | 2 + .../patch/patch/unified-reject-files.diff | 2 + .../python/python-imaging/path.patch | 2 + .../subversion/disable-revision-install.patch | 2 + .../subversion/subversion/libtool2.patch | 2 + .../subversion/subversion/neon-detection.patch | 2 + meta/recipes-extended/bash/bash.inc | 2 +- .../sat-solver/fix_gcc-4.6.0_compile_issue.patch | 115 ++++++++++++++++++++ meta/recipes-extended/sat-solver/sat-solver_git.bb | 5 +- meta/recipes-extended/sysstat/sysstat.inc | 4 +- meta/recipes-extended/sysstat/sysstat_9.1.5.bb | 2 +- meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb | 2 +- .../clutter/clutter-gst/enable_tests-1.4.patch | 15 +++ meta/recipes-sato/web/web_svn.bb | 2 +- .../libpcre/files/fix-pcre-name-collision.patch | 1 + .../recipes-support/libpcre/files/pcre-cross.patch | 2 + 55 files changed, 267 insertions(+), 34 deletions(-) create mode 100644 meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch
PATCH 1/20 git: make it work on the target
From: Koen Kooi <[email protected]>
Packaging is synced with OE .dev, but without the -large, thanks to pseudo we retain all (hard)links properly:
* git-perltools holds all the utils requiring perl and adds appropriate RDEPENDS
* git-tk holds the tcl/tk utils once they get activate
* git now packages /usr/libexec/git-core
The result:
8.5M ipk/armv7a/git_1.7.4.3-r2_armv7a.ipk
3.1M ipk/armv7a/git-dbg_1.7.4.3-r2_armv7a.ipk
4.0K ipk/armv7a/git-dev_1.7.4.3-r2_armv7a.ipk
12K ipk/armv7a/git-doc_1.7.4.3-r2_armv7a.ipk
136K ipk/armv7a/git-perltools_1.7.4.3-r2_armv7a.ipk
Signed-off-by Koen Kooi <[email protected]>
Signed-off-by Saul Wold <[email protected]>
--- meta/recipes-devtools/git/git.inc | 32 ++++++++++++++++++++++++++++- meta/recipes-devtools/git/git_1.7.4.3.bb | 2 +- 2 files changed, 31 insertions(+), 3 deletions(-)
meta/recipes-devtools/git/git.inc +30 -2
@@ -14,11 +14,39 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl --without-tcltk" inherit autotools do_install () { - oe_runmake install DESTDIR="${D}" bindir=${bindir} gitexecdir=${gitexecdir} \ + oe_runmake install DESTDIR="${D}" bindir=${bindir} \ template_dir=${datadir}/git-core/templates \ GIT_PYTHON_DIR=${D}${datadir}/git-core/python } -FILES_${PN} += "${datadir}/git-core" +FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/" +FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" + +# Git tools requiring perl +PACKAGES =+ "${PN}-perltools" +FILES_${PN}-perltools += " \ + ${libexecdir}/git-core/git-add--interactive \ + ${libexecdir}/git-core/git-archimport \ + ${libexecdir}/git-core/git-cvsexportcommit \ + ${libexecdir}/git-core/git-cvsimport \ + ${libexecdir}/git-core/git-cvsserver \ + ${bindir}/git-cvsserver \ + ${libexecdir}/git-core/git-difftool \ + ${libexecdir}/git-core/git-relink \ + ${libexecdir}/git-core/git-send-email \ + ${libexecdir}/git-core/git-svn \ + ${datadir}/perl \ +" +RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" + +# git-tk package with gitk and git-gui +PACKAGES =+ "${PN}-tk" +RDEPENDS_${PN}-tk = "${PN} tk tcl" +EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh" +FILES_${PN}-tk = " \ + ${bindir}/gitk \ + ${datadir}/gitk \ +" + BBCLASSEXTEND = "native"
meta/recipes-devtools/git/git_1.7.4.3.bb +1 -1
@@ -1,6 +1,6 @@ require git.inc -PR = "r1" +PR = "r2" EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
Signature · 1 line
1.7.1.1
PATCH 2/20 clutter-gst-1.4: Add missing patch
In reply to Saul WoldFrom: Saul Wold <[email protected]>
Signed-off-by Saul Wold <[email protected]>
--- .../clutter/clutter-gst/enable_tests-1.4.patch | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch
meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch new file +15 -0
@@ -0,0 +1,15 @@ +Install example binary needed for core-image-clutter + +Signed-off-by: Zhai Edwin <[email protected]> +Index: git/examples/Makefile.am +=================================================================== +--- git.orig/examples/Makefile.am 2011-05-04 14:07:21.000000000 -0700 ++++ git/examples/Makefile.am 2011-05-04 14:24:38.625984314 -0700 +@@ -1,6 +1,6 @@ + NULL = # + +-noinst_PROGRAMS = video-player video-sink audio-player ++bin_PROGRAMS = video-player video-sink audio-player + + INCLUDES = -I$(top_srcdir) \ + $(MAINTAINER_CFLAGS) \
Signature · 1 line
1.7.1.1
PATCH 3/20 gtkhtml2, web: Sync version for API Change
In reply to Saul WoldFrom: Saul Wold <[email protected]>
Sync up the css_parser API between web and gtkhtml2
Signed-off-by Saul Wold <[email protected]>
--- meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb | 2 +- meta/recipes-sato/web/web_svn.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb +1 -1
@@ -8,7 +8,7 @@ SRCREV = "1144" PV = "2.11.0+svnr${SRCPV}" PR = "r1" -SRC_URI = "svn://[email protected]/svn/gtkhtml2/;module=trunk \ +SRC_URI = "svn://svn.gnome.org/svn/gtkhtml2/;module=trunk;proto=http \ http://svn.o-hand.com/repos/web/trunk/patches/at-import_box-pos.patch;patch=1;pnum=0;maxrev=1157;name=patch1 \ http://svn.o-hand.com/repos/web/trunk/patches/css-stylesheet-user.patch;patch=1;pnum=0;maxrev=1157;name=patch2 \ http://svn.o-hand.com/repos/web/trunk/patches/css-media.patch;patch=1;pnum=0;maxrev=1157;name=patch3 \
meta/recipes-sato/web/web_svn.bb +1 -1
@@ -4,7 +4,7 @@ DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl" DESCRIPTION = "Web is a multi-platform web browsing application." PR = "r4" -SRCREV = "129" +SRCREV = "131" PV = "0.0+svnr${SRCPV}" SRC_URI = "svn://svn.o-hand.com/repos/${BPN};module=trunk;proto=http \
Signature · 1 line
1.7.1.1
PATCH 4/20 libpcre: update upstream status for patches
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
Signed-off-by Nitin A Kamble <[email protected]>
--- .../libpcre/files/fix-pcre-name-collision.patch | 1 + .../recipes-support/libpcre/files/pcre-cross.patch | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch +1 -0
@@ -1,3 +1,4 @@ +Upstream-Status="Inappropriate [debian patch]" This patch address a namespace collision with libc.
meta/recipes-support/libpcre/files/pcre-cross.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [configuration]" + To be upstreamable, this patch requires check for *_FOR_BUILD, otherwise it needs to pass special variables.
Signature · 1 line
1.7.1.1
PATCH 5/20 patch-2.6.1: update patch upstream status
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
Signed-off-by Nitin A Kamble <[email protected]>
--- .../patch/patch-2.6.1/global-reject-file.diff | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
meta/recipes-devtools/patch/patch-2.6.1/global-reject-file.diff +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [debian patch]" + Index: patch-2.6.1/patch.man =================================================================== --- patch-2.6.1.orig/patch.man
Signature · 1 line
1.7.1.1
PATCH 6/20 patch: update upstream status for patches
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
Signed-off-by Nitin A Kamble <[email protected]>
--- meta/recipes-devtools/patch/patch/debian.patch | 2 ++ .../patch/patch/global-reject-file.diff | 2 ++ meta/recipes-devtools/patch/patch/install.patch | 2 ++ .../patch/patch/unified-reject-files.diff | 2 ++ 4 files changed, 8 insertions(+), 0 deletions(-)
meta/recipes-devtools/patch/patch/debian.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [debian patch]" + --- patch-2.5.9.orig/m4/hash.m4 +++ patch-2.5.9/m4/hash.m4 @@ -0,0 +1,15 @@
meta/recipes-devtools/patch/patch/global-reject-file.diff +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [debian patch]" + Index: patch-2.5.9/patch.man =================================================================== --- patch-2.5.9.orig/patch.man
meta/recipes-devtools/patch/patch/install.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [embedded specific]" + Index: patch-2.5.4/Makefile.in =================================================================== --- patch-2.5.4.orig/Makefile.in 2005-03-09 07:23:54.779311824 -0500
meta/recipes-devtools/patch/patch/unified-reject-files.diff +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [debian patch]" + Generate unified diff style reject files. Also include the C function names in reject files whenever possible.
Signature · 1 line
1.7.1.1
PATCH 7/20 python-imaging: update upstream status for patches
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
Signed-off-by Nitin A Kamble <[email protected]>
--- .../python/python-imaging/path.patch | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
meta/recipes-devtools/python/python-imaging/path.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [embedded specific]" + Index: Imaging-1.1.7/setup.py =================================================================== --- Imaging-1.1.7.orig/setup.py
Signature · 1 line
1.7.1.1
PATCH 8/20 subversion: update upstream status for patches
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
Signed-off-by Nitin A Kamble <[email protected]>
--- .../subversion/disable-revision-install.patch | 2 ++ .../subversion/subversion/libtool2.patch | 2 ++ .../subversion/subversion/neon-detection.patch | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-)
meta/recipes-devtools/subversion/subversion/disable-revision-install.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [embedded specific]" + Index: subversion-1.6.15/Makefile.in =================================================================== --- subversion-1.6.15.orig/Makefile.in 2010-11-17 06:47:23.000000000 -0800
meta/recipes-devtools/subversion/subversion/libtool2.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [embedded specific]" + Index: subversion-1.5.5/configure.ac =================================================================== --- subversion-1.5.5.orig/configure.ac 2008-08-26 18:27:56.000000000 +0100
meta/recipes-devtools/subversion/subversion/neon-detection.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [embedded specific]" + Index: subversion-1.6.13/build/ac-macros/neon.m4 =================================================================== --- subversion-1.6.13.orig/build/ac-macros/neon.m4
Signature · 1 line
1.7.1.1
PATCH 9/20 sat-solver: fix compilation issue with gcc 4.6.0
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
Signed-off-by Nitin A Kamble <[email protected]>
--- .../sat-solver/fix_gcc-4.6.0_compile_issue.patch | 115 ++++++++++++++++++++ meta/recipes-extended/sat-solver/sat-solver_git.bb | 5 +- 2 files changed, 119 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch
meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch new file +115 -0
@@ -0,0 +1,115 @@ +Upstream-Status="Pending" + +Fix the following compilation issues with gcc 4.6.0 + +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c: In function 'startElement': +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c:278:25: error: variable 'status' set but not used [-Werror=unused-but-set-variable] +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c:386:36: error: variable 'src' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make[2]: *** [ext/CMakeFiles/satsolverext.dir/repo_updateinfoxml.o] Error 1 +| make[2]: *** Waiting for unfinished jobs.... +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/src/transaction.c: In function 'transaction_add_obsoleted': +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/src/transaction.c:1933:21: error: variable 'oldcount' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make[2]: *** [src/CMakeFiles/satsolver.dir/transaction.o] Error 1 +| make[2]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git' +| make[1]: *** [src/CMakeFiles/satsolver.dir/all] Error 2 +| make[1]: *** Waiting for unfinished jobs.... +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c: In function 'rpm_byfp': +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2406:20: error: variable 'headerend' set but not used [-Werror=unused-but-set-variable] +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c: In function 'parsekeydata': +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2833:29: error: variable 'scr' set but not used [-Werror=unused-but-set-variable] +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2669:7: error: variable 'useridl' set but not used [-Werror=unused-but-set-variable] +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2667:7: error: variable 'pubkeyl' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make[2]: *** [ext/CMakeFiles/satsolverext.dir/repo_rpmdb.o] Error 1 +| make[2]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git' +| make[1]: *** [ext/CMakeFiles/satsolverext.dir/all] Error 2 +| make[1]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git' +| make: *** [all] Error 2 +| FATAL: oe_runmake failed +| ERROR: Function 'do_compile' failed (see /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/temp/log.do_compile.21830 for further information) +NOTE: package sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9: task do_compile: Failed + +Nitin A Kamble <[email protected]> 2011/05/05 + +Index: git/src/transaction.c +=================================================================== +--- git.orig/src/transaction.c ++++ git/src/transaction.c +@@ -1930,7 +1930,7 @@ transaction_add_obsoleted(Transaction *t + Repo *installed = pool->installed; + Id p; + Solvable *s; +- int i, j, k, max, oldcount; ++ int i, j, k, max; + Map done; + Queue obsq, *steps; + +@@ -1945,7 +1945,6 @@ transaction_add_obsoleted(Transaction *t + return; + /* make room */ + steps = &trans->steps; +- oldcount = steps->count; + queue_insertn(steps, 0, max); + + /* now add em */ +Index: git/ext/repo_updateinfoxml.c +=================================================================== +--- git.orig/ext/repo_updateinfoxml.c ++++ git/ext/repo_updateinfoxml.c +@@ -275,7 +275,7 @@ startElement(void *userData, const char + */ + case STATE_UPDATE: + { +- const char *from = 0, *status = 0, *type = 0, *version = 0; ++ const char *from = 0, __attribute__((__unused__)) *status = 0, *type = 0, *version = 0; + for (; *atts; atts += 2) + { + if (!strcmp(*atts, "from")) +@@ -383,7 +383,7 @@ startElement(void *userData, const char + */ + case STATE_PACKAGE: + { +- const char *arch = 0, *name = 0, *src = 0; ++ const char *arch = 0, *name = 0, __attribute__((__unused__)) *src = 0; + Id evr = makeevr_atts(pool, pd, atts); /* parse "epoch", "version", "release" */ + Id n, a = 0; + Id rel_id; +Index: git/ext/repo_rpmdb.c +=================================================================== +--- git.orig/ext/repo_rpmdb.c ++++ git/ext/repo_rpmdb.c +@@ -2403,7 +2403,7 @@ void * + rpm_byfp(FILE *fp, const char *name, void **statep) + { + struct rpm_by_state *state = *statep; +- int headerstart, headerend; ++ int headerstart, __attribute__((__unused__))headerend; + RpmHead *rpmhead; + int sigdsize, sigcnt, l; + unsigned char lead[4096]; +@@ -2664,9 +2664,9 @@ parsekeydata(Solvable *s, Repodata *data + unsigned char keyid[8]; + unsigned int kcr = 0, maxex = 0; + unsigned char *pubkey = 0; +- int pubkeyl = 0; ++ int __attribute__((__unused__)) pubkeyl = 0; + unsigned char *userid = 0; +- int useridl = 0; ++ int __attribute__((__unused__)) useridl = 0; + + for (; pl; p += l, pl -= l) + { +@@ -2830,7 +2830,7 @@ parsekeydata(Solvable *s, Repodata *data + { + int j, ql, haveissuer; + unsigned char *q; +- unsigned int ex = 0, scr = 0; ++ unsigned int ex = 0, __attribute__((__unused__))scr = 0; + unsigned char issuer[8]; + + // printf("V4 signature packet\n");
meta/recipes-extended/sat-solver/sat-solver_git.bb +4 -1
@@ -8,7 +8,9 @@ DEPENDS = "libcheck rpm zlib expat db" SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32" PV = "0.0-git${SRCPV}" -PR = "r9" +PR = "r10" + +PARALLEL_MAKE="" SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \ file://sat-solver_rpm5.patch \
@@ -16,6 +18,7 @@ SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \ file://cmake.patch \ file://db5.patch \ file://sat-solver_core.patch \ + file://fix_gcc-4.6.0_compile_issue.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
1.7.1.1
PATCH 10/20 gcc-4.5.1: update upstream status of patches
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
Signed-off-by Nitin A Kamble <[email protected]>
--- .../gcc/gcc-4.5.1/100-uclibc-conf.patch | 2 ++ .../gcc/gcc-4.5.1/103-uclibc-conf-noupstream.patch | 2 ++ .../gcc/gcc-4.5.1/200-uclibc-locale.patch | 2 ++ .../gcc/gcc-4.5.1/203-uclibc-locale-no__x.patch | 2 ++ .../gcc-4.5.1/204-uclibc-locale-wchar_fix.patch | 2 ++ .../gcc/gcc-4.5.1/205-uclibc-locale-update.patch | 2 ++ .../gcc/gcc-4.5.1/301-missing-execinfo_h.patch | 2 ++ .../gcc/gcc-4.5.1/302-c99-snprintf.patch | 2 ++ .../gcc/gcc-4.5.1/303-c99-complex-ugly-hack.patch | 2 ++ .../gcc/gcc-4.5.1/304-index_macro.patch | 2 ++ .../gcc-4.5.1/305-libmudflap-susv3-legacy.patch | 2 ++ .../gcc/gcc-4.5.1/306-libstdc++-namespace.patch | 2 ++ .../gcc/gcc-4.5.1/307-locale_facets.patch | 2 ++ .../gcc/gcc-4.5.1/602-sdk-libstdc++-includes.patch | 2 ++ .../recipes-devtools/gcc/gcc-4.5.1/64bithack.patch | 2 ++ .../gcc/gcc-4.5.1/740-sh-pr24836.patch | 2 ++ .../gcc/gcc-4.5.1/800-arm-bigendian.patch | 2 ++ .../gcc/gcc-4.5.1/904-flatten-switch-stmt-00.patch | 2 ++ .../gcc/gcc-4.5.1/arm-bswapsi2.patch | 2 ++ .../gcc/gcc-4.5.1/arm-nolibfloat.patch | 2 ++ .../gcc/gcc-4.5.1/arm-softfloat.patch | 2 ++ 21 files changed, 42 insertions(+), 0 deletions(-)
meta/recipes-devtools/gcc/gcc-4.5.1/100-uclibc-conf.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.3.1/contrib/regression/objs-gcc.sh =================================================================== --- gcc-4.3.1.orig/contrib/regression/objs-gcc.sh 2007-12-24 15:18:57.000000000 -0800
meta/recipes-devtools/gcc/gcc-4.5.1/103-uclibc-conf-noupstream.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Corrects sub machine arch corectly Index: gcc-4.5.0/gcc/config.gcc
meta/recipes-devtools/gcc/gcc-4.5.1/200-uclibc-locale.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.5.0/libstdc++-v3/acinclude.m4 =================================================================== --- gcc-4.5.0.orig/libstdc++-v3/acinclude.m4 2010-04-05 18:27:44.000000000 -0700
meta/recipes-devtools/gcc/gcc-4.5.1/203-uclibc-locale-no__x.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h =================================================================== --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-16 01:29:20.000000000 -0700
meta/recipes-devtools/gcc/gcc-4.5.1/204-uclibc-locale-wchar_fix.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + --- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100 +++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:37:27 +0100 @@ -401,7 +401,7 @@
meta/recipes-devtools/gcc/gcc-4.5.1/205-uclibc-locale-update.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc =================================================================== --- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-09-17 22:35:28.000000000 -0700
meta/recipes-devtools/gcc/gcc-4.5.1/301-missing-execinfo_h.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.5.0/boehm-gc/include/gc.h =================================================================== --- gcc-4.5.0.orig/boehm-gc/include/gc.h 2007-04-23 14:10:09.000000000 -0700
meta/recipes-devtools/gcc/gcc-4.5.1/302-c99-snprintf.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.5.0/libstdc++-v3/include/c_std/cstdio =================================================================== --- gcc-4.5.0.orig/libstdc++-v3/include/c_std/cstdio 2010-02-04 10:20:34.000000000 -0800
meta/recipes-devtools/gcc/gcc-4.5.1/303-c99-complex-ugly-hack.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [embedded specific]" + Index: gcc-4.5.0/libstdc++-v3/configure =================================================================== --- gcc-4.5.0.orig/libstdc++-v3/configure 2010-06-25 10:48:37.488384191 -0700
meta/recipes-devtools/gcc/gcc-4.5.1/304-index_macro.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.5.0/libstdc++-v3/include/ext/rope =================================================================== --- gcc-4.5.0.orig/libstdc++-v3/include/ext/rope 2009-04-09 08:00:19.000000000 -0700
meta/recipes-devtools/gcc/gcc-4.5.1/305-libmudflap-susv3-legacy.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [embedded specific]" + Index: gcc-4.5.0/libmudflap/mf-hooks2.c =================================================================== --- gcc-4.5.0.orig/libmudflap/mf-hooks2.c 2009-04-09 08:00:19.000000000 -0700
meta/recipes-devtools/gcc/gcc-4.5.1/306-libstdc++-namespace.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.5.0/libstdc++-v3/config/locale/uclibc/messages_members.h =================================================================== --- gcc-4.5.0.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2010-06-25 10:49:07.024632961 -0700
meta/recipes-devtools/gcc/gcc-4.5.1/307-locale_facets.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + This patch fixes a bug into ostream::operator<<(double) due to the wrong size passed into the __convert_from_v method. The wrong size is then passed to std::snprintf function, that, on uClibc, doens't handle sized 0 buffer.
meta/recipes-devtools/gcc/gcc-4.5.1/602-sdk-libstdc++-includes.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [embedded specific]" + --- gcc-4.1.0/libstdc++-v3/fragment.am 2005-03-21 11:40:14.000000000 -0600 +++ gcc-4.1.0-patched/libstdc++-v3/fragment.am 2005-04-25 20:14:39.856251785 -0500 @@ -21,5 +21,5 @@
meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [embedded specific]" + By default gcc places 64 bit libs in a lib64 directory. This makes it use "lib" instead.
meta/recipes-devtools/gcc/gcc-4.5.1/740-sh-pr24836.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24836
meta/recipes-devtools/gcc/gcc-4.5.1/800-arm-bigendian.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + By Lennert Buytenhek <[email protected]> Adds support for arm*b-linux* big-endian ARM targets
meta/recipes-devtools/gcc/gcc-4.5.1/904-flatten-switch-stmt-00.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Hi, The attached patch makes sure that we create smaller object code for
meta/recipes-devtools/gcc/gcc-4.5.1/arm-bswapsi2.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.5/gcc/config/arm/arm.md =================================================================== --- gcc-4.5.orig/gcc/config/arm/arm.md 2010-06-17 09:13:07.000000000 -0700
meta/recipes-devtools/gcc/gcc-4.5.1/arm-nolibfloat.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + # Dimitry Andric <[email protected]>, 2004-05-01 # # * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed
meta/recipes-devtools/gcc/gcc-4.5.1/arm-softfloat.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.5.0/gcc/config/arm/t-linux =================================================================== --- gcc-4.5.0.orig/gcc/config/arm/t-linux 2009-04-21 12:03:23.000000000 -0700
Signature · 1 line
1.7.1.1
PATCH 11/20 binutils: update upstream status of patches
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
Signed-off-by Nitin A Kamble <[email protected]>
--- .../binutils/binutils-2.21/110-arm-eabi-conf.patch | 2 ++ .../binutils-2.21/binutils-2.19.1-ld-sysroot.patch | 2 ++ .../binutils/binutils-2.21/binutils-poison.patch | 2 ++ .../binutils-uclibc-100-uclibc-conf.patch | 2 ++ 4 files changed, 8 insertions(+), 0 deletions(-)
meta/recipes-devtools/binutils/binutils-2.21/110-arm-eabi-conf.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + --- /tmp/configure.ac 2008-06-22 14:14:59.000000000 +0200 +++ binutils-2.18.50.0.7/configure.ac 2008-06-22 14:15:30.000000000 +0200 @@ -561,7 +561,7 @@
meta/recipes-devtools/binutils/binutils-2.21/binutils-2.19.1-ld-sysroot.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + http://sourceware.org/bugzilla/show_bug.cgi?id=10340 Signed-off-by: Sven Rebhan <[email protected]>
meta/recipes-devtools/binutils/binutils-2.21/binutils-poison.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [distribution: codesourcery]" + Patch originally created by Mark Hatle, forward-ported to binutils 2.21 by Scott Garman.
meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-100-uclibc-conf.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status="Pending" + --- binutils-2.18.orig/configure +++ binutils-2.18/configure @@ -2206,7 +2206,7 @@
Signature · 1 line
1.7.1.1
PATCH 12/20 gnu-config-native: add dependency on perl-native
In reply to Saul WoldFrom: Dexuan Cui <[email protected]>
Fixes [YOCTO #968]
Signed-off-by Dexuan Cui <[email protected]>
--- .../gnu-config/config-guess-uclibc.patch | 2 ++ .../gnu-config/gnu-config_20080123.bb | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-)
meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch +2 -0
@@ -1,3 +1,5 @@ +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)
meta/recipes-devtools/gnu-config/gnu-config_20080123.bb +4 -2
@@ -3,12 +3,14 @@ DESCRIPTION = "Tool that installs the GNU config.guess / config.sub into a direc SECTION = "devel" LICENSE = "GPLv1+" LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=a089987af4a25cb0419d1c2fd6d495e3" -DEPENDS = "" + +DEPENDS_virtclass-native = "perl-native" + INHIBIT_DEFAULT_DEPS = "1" FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" PV = "0.1+cvs${FIXEDSRCDATE}" -PR = "r2" +PR = "r3" SRC_URI = "cvs://[email protected]/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \ file://config-guess-uclibc.patch \
Signature · 1 line
1.7.1.1
PATCH 13/20 conf/layer.conf: Use .= to append to BBPATH and += for BBFILES
In reply to Saul WoldFrom: Khem Raj <[email protected]>
This helps bitbake in organising BBPATH and BBFILES with given BBFILE_PRIORITY order
Signed-off-by Khem Raj <[email protected]>
--- meta/conf/layer.conf | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
meta/conf/layer.conf +2 -3
@@ -1,9 +1,8 @@ BBPATH ?= "" # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" - +BBPATH .= ":${LAYERDIR}" # We have a packages directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb ${LAYERDIR}/recipes-*/*/*.bb" +BBFILES += "${LAYERDIR}/packages/*/*.bb ${LAYERDIR}/recipes-*/*/*.bb" BBFILE_COLLECTIONS += "normal" BBFILE_PATTERN_normal := "^${LAYERDIR}/"
Signature · 1 line
1.7.1.1
PATCH 14/20 package.bbclass: convert unpackaged file message from 'info' to 'warn' so that it shows up on the console
In reply to Saul WoldFrom: Koen Kooi <[email protected]>
Signed-off-by Koen Kooi <[email protected]>
--- meta/classes/package.bbclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/classes/package.bbclass +2 -2
@@ -676,9 +676,9 @@ python populate_packages () { unshipped.append(path) if unshipped != []: - bb.note("the following files were installed but not shipped in any package:") + bb.warn("the following files were installed but not shipped in any package:") for f in unshipped: - bb.note(" " + f) + bb.warn(" " + f) bb.build.exec_func("package_name_hook", d)
Signature · 1 line
1.7.1.1
PATCH 15/20 gcc-package-target: Switch to TARGET_PREFIX in symlinks
In reply to Saul WoldFrom: Tom Rini <[email protected]>
When TARGET_PREFIX and TARGET_SYS didn't match up, the symlinks we made were invalid. TARGET_PREFIX is what we use when configuring so it's what we should be using here.
This is 05143e9b5d0a42e32ee0dd3c7fde482ff8d63f63 from OE.
Signed-off-by Tom Rini <[email protected]>
--- meta/recipes-devtools/gcc/gcc-package-target.inc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-devtools/gcc/gcc-package-target.inc +5 -5
@@ -91,13 +91,13 @@ do_install () { find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f # Symlinks so we can use these trivially on the target - ln -sf ${TARGET_SYS}-g77 g77 || true - ln -sf ${TARGET_SYS}-gfortran gfortran || true - ln -sf ${TARGET_SYS}-g++ g++ - ln -sf ${TARGET_SYS}-gcc gcc + ln -sf ${TARGET_PREFIX}g77 g77 || true + ln -sf ${TARGET_PREFIX}gfortran gfortran || true + ln -sf ${TARGET_PREFIX}g++ g++ + ln -sf ${TARGET_PREFIX}gcc gcc ln -sf g77 f77 || true ln -sf gfortran f95 || true ln -sf g++ c++ ln -sf gcc cc - ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp + ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${bindir}/cpp }
Signature · 1 line
1.7.1.1
PATCH 16/20 binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS
In reply to Saul WoldFrom: Tom Rini <[email protected]>
When TARGET_PREFIX and TARGET_SYS didn't match up, the symlinks and update-alternatives weren't working. TARGET_PREFIX is what we use when configuring so it's what we should be using here.
This is 79b497edc0ce5d54db564818e59b690d3391d6ce from OE.
Signed-off-by Tom Rini <[email protected]>
--- meta/recipes-devtools/binutils/binutils.inc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-devtools/binutils/binutils.inc +5 -5
@@ -110,7 +110,7 @@ do_install () { # Symlinks for ease of running these on the native target for p in ${TARGET_SYS}-* ; do - ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,` + ln -sf $p `echo $p | sed -e s,${TARGET_PREFIX},,` done rm ${D}${bindir}/ar ${D}${bindir}/strings
@@ -139,11 +139,11 @@ do_install_virtclass-native () { } pkg_postinst_${PN}-symlinks () { - update-alternatives --install ${bindir}/ar ar ${TARGET_SYS}-ar 100 - update-alternatives --install ${bindir}/strings strings ${TARGET_SYS}-strings 100 + update-alternatives --install ${bindir}/ar ar ${TARGET_PREFIX}ar 100 + update-alternatives --install ${bindir}/strings strings ${TARGET_PREFIX}strings 100 } pkg_prerm_${PN}-symlinks () { - update-alternatives --remove ar ${TARGET_SYS}-ar - update-alternatives --remove strings ${TARGET_SYS}-strings + update-alternatives --remove ar ${TARGET_PREFIX}ar + update-alternatives --remove strings ${TARGET_PREFIX}strings }
Signature · 1 line
1.7.1.1
PATCH 17/20 sysstat.inc: Switch to inherit gettext
In reply to Saul WoldFrom: Tom Rini <[email protected]>
This needs to use both virtual/libnl as well as gettext-native in order to build. So we switch to using inherit gettext.
This is 4a022cf3fe3e39aab478bfc13332d358ed80348c from OE where it was tested with qemuarm+angstrom-2010.x+eglibc and qemuarm+minimal-uclibc.
Signed-off-by Tom Rini <[email protected]>
--- meta/recipes-extended/sysstat/sysstat.inc | 4 +--- meta/recipes-extended/sysstat/sysstat_9.1.5.bb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-)
meta/recipes-extended/sysstat/sysstat.inc +1 -3
@@ -4,12 +4,10 @@ HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/" LICENSE = "GPLv2+" SECTION = "console/utils" -DEPENDS = "virtual/libintl" - SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \ file://99_sysstat" -inherit autotools +inherit autotools gettext do_install() { autotools_do_install
meta/recipes-extended/sysstat/sysstat_9.1.5.bb +1 -1
@@ -2,7 +2,7 @@ require sysstat.inc LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -PR = "r0" +PR = "r1"
Signature · 1 line
1.7.1.1
PATCH 18/20 bash.inc: Add bison-native to DEPENDS
In reply to Saul WoldFrom: Tom Rini <[email protected]>
This is f0652d96ff5c3b08b8e4c4972f7fb0296df6d898 from OE.
Signed-off-by Tom Rini <[email protected]>
--- meta/recipes-extended/bash/bash.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-extended/bash/bash.inc +1 -1
@@ -5,7 +5,7 @@ SECTION = "base/shell" # GPLv2+ (< 4.0), GPLv3+ (>= 4.0) LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "ncurses" +DEPENDS = "ncurses bison-native" inherit autotools gettext
Signature · 1 line
1.7.1.1
PATCH 19/20 gettext.bbclass, bitbake.conf: Append nls options to EXTRA_OECONF instead of +=
In reply to Saul WoldFrom: Khem Raj <[email protected]>
Some recipes do not defined EXTRA_OECONF in such cases += drops the --enable|--disable-nls options. In another case where recipe defines EXTRA_OECONF instead of adding/appending to it then --enable|--disable-nls options are lost from EXTRA_OECONF
We define EXTRA_OECONF = "" in bitbake.conf so the variable exists always.
We use _append instead of += so the option is added at very end and not lost.
We only return empty gettext dependencies if its a target recipe
in case when USE_NLS is not set because the native/cross/nativesdk recipes still need the gettext dependencies
Signed-off-by Khem Raj <[email protected]>
--- meta/classes/gettext.bbclass | 6 +++--- meta/conf/bitbake.conf | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
meta/classes/gettext.bbclass +3 -3
@@ -1,7 +1,7 @@ def gettext_dependencies(d): - if d.getVar('USE_NLS', True) == 'no': + if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'native', 'nativesdk', 'cross'): return "" - if bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, True) and not oe.utils.inherits(d, 'cross-canadian'): + if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d, 'cross-canadian'): return "" return d.getVar('DEPENDS_GETTEXT', False)
@@ -14,4 +14,4 @@ def gettext_oeconf(d): DEPENDS_GETTEXT = "virtual/gettext gettext-native" BASEDEPENDS =+ "${@gettext_dependencies(d)}" -EXTRA_OECONF += "${@gettext_oeconf(d)}" +EXTRA_OECONF_append = " ${@gettext_oeconf(d)}"
meta/conf/bitbake.conf +1 -1
@@ -395,7 +395,7 @@ export BUILD_NM = "${BUILD_PREFIX}nm" export MAKE = "make" EXTRA_OEMAKE = "-e MAKEFLAGS=" - +EXTRA_OECONF = "" export LC_ALL = "C" ##################################################################
Signature · 1 line
1.7.1.1
PATCH 20/20 u-boot: correct COPYING MD5SUM
In reply to Saul WoldFrom: Darren Hart <[email protected]>
Signed-off-by Darren Hart <[email protected]>
--- meta/recipes-bsp/uboot/u-boot_git.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-bsp/uboot/u-boot_git.bb +2 -2
@@ -1,14 +1,14 @@ require u-boot.inc LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ +LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b \ file://README;beginline=1;endline=22;md5=3a00ef51d3fc96e9d6c1bc4708ccd3b5" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}" SRCREV = "v2010.12" PV = "v2010.12+${PR}+git${SRCPV}" -PR="r1" +PR="r2" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
Signature · 1 line
1.7.1.1
Richard Purdie
AppliedQuoted 6 lines · Saul Wold
Here is a batch of changes from last week.
This contains a fix for gnu-config that is a workaround for a Bernard Bug that we need to back port.
I have test built for x86, arm and the toolchains
Merged to master, thanks.
Richard