Re: [OE-core] Piglit in Poky
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Philip Balister schreef op 28-12-13 23:33: On 12/28/2013 10:28 AM, Koen Kooi wrote: Paul Eggleton schreef op 28-12-13 12:48: Hi Koen, On Tuesday 24 December 2013 15:22:32 Koen Kooi wrote: Burton, Ross schreef op 23-12-13 19:01: We'd like to integrate Piglit (an OpenGL test suite) into Poky so that we can run automated QA on the GL stack. Piglit is currently residing in meta-oe, but as Poky is a self-contained project we can't just add meta-oe to it: apart from the size of meta-oe, we can't ensure stability if meta-oe makes incompatible changes that affect Poky. Piglit isn't a stand-alone package, there are the dependencies of waffle, python-mako and python-numpy to consider too. There are two possibilities I can see: 1) Move piglit and deps to oe-core. Piglit is for QA purposes only and pushes the boundaries of core platform. In a sense this is a repeat of the discussion we had with Midori... does oe-core contain everything needed to sufficiently exercise the core components it ships or not? 2) Add piglit and deps to meta-yocto. Probably a new layer called meta-yocto-qa (or similar) because the Yocto Compatible guidelines forbid mixing distribution policy and recipes. Speaking of layers, can you *please* rename meta-yocto to meta-poky? It's what it's actually is and would remove a lot of confusion when trying to explain that yocto is not a distro, even if the distro layer is called 'meta-yocto'. This is a tangent, but a couple of points: 1) This rename would not come for free. We'd need to update people's existing bblayers.conf files on the fly, as we did when meta-yocto-bsp was split out of meta-yocto, and thus bump LCONF_VERSION; however, doing this only in poky has resulted in annoying problems when users remove poky from their configurations (since LCONF_VERSION is out-of-step between Poky and OE-Core, leading to confusing errors in this situation). Thus I think we'd want to solve this once and for all by bumping the value in OE-Core as well as Poky. 2) If you propose this rename, perhaps you will also consider renaming meta-oe, since that name within a similarly named meta-openembedded repository leads to a similar level of confusion...? I have no problems with renaming that layer since I get confused by this a few times a week myself :) What would we we rename it to? I'm very tempted to suggest 'meta-yocto' -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (Darwin) Comment: GPGTools - http://gpgtools.org iD8DBQFSwEN0MkyGM64RGpERAnuDAKC5kxJXiSjM0RtJPu8Gksu4t7IaOACdFyyq vPBlgjhnZyECigXVQNUkj1U= =laEu -END PGP SIGNATURE- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH v2] db : Include C++ binding library in Berkeley DB recipe.
Create the C++ library for db. This library is packaged in a new package so the db package only contains the c library. This prevents existing users from adding libstdc++ to the package DEPENDS. Signed-off-by: Philip Balister phi...@balister.org Signed-off-by: Douglas Geiger doug.gei...@bioradiation.net Signed-off-by: Steve Arnold est...@gentoogeek.org foo Signed-off-by: Philip Balister phi...@balister.org --- meta/recipes-support/db/db_5.3.21.bb | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/meta/recipes-support/db/db_5.3.21.bb b/meta/recipes-support/db/db_5.3.21.bb index 328f9db..5abc1fe 100644 --- a/meta/recipes-support/db/db_5.3.21.bb +++ b/meta/recipes-support/db/db_5.3.21.bb @@ -17,7 +17,8 @@ RCONFLICTS_${PN} = db3 SRC_URI = http://download.oracle.com/berkeley-db/db-${PV}.tar.gz; SRC_URI += file://arm-thumb-mutex_db5.patch;patchdir=.. \ -file://fix-parallel-build.patch +file://fix-parallel-build.patch \ + SRC_URI[md5sum] = 3fda0b004acdaa6fa350bfc41a3b95ca SRC_URI[sha256sum] = ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8 @@ -47,18 +48,22 @@ B = ${WORKDIR}/db-${PV}/build_unix # management on the system. inherit lib_package +PACKAGES =+ ${PN}-cxx +FILES_${PN}-cxx = ${libdir}/*cxx*so + + # The dev package has the .so link (as in db3) and the .a's - # it is therefore incompatible (cannot be installed at the # same time) as the db3 package # sort out the .so since they do version prior to the .so SOLIBS = -5*.so -FILES_SOLIBSDEV = ${libdir}/libdb.so +FILES_SOLIBSDEV = ${libdir}/libdb.so ${libdir}/libdb_cxx.so #configuration - set in local.conf to override # All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix) DB5_CONFIG ?= --enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql -EXTRA_OECONF = ${DB5_CONFIG} +EXTRA_OECONF = ${DB5_CONFIG} --enable-shared --enable-cxx # Override the MUTEX setting here, the POSIX library is # the default - POSIX/pthreads/library. @@ -80,16 +85,17 @@ do_configure() { oe_runconf } +do_compile_prepend() { + sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' \ + ${B}/libtool +} + do_install_append() { mkdir -p ${D}/${includedir}/db51 - #mv ${D}/${includedir}/db_185.h ${D}/${includedir}/db51/. mv ${D}/${includedir}/db.h ${D}/${includedir}/db51/. mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db51/. - #mv ${D}/${includedir}/dbsql.h ${D}/${includedir}/db51/. - #ln -s db51/db_185.h ${D}/${includedir}/db_185.h ln -s db51/db.h ${D}/${includedir}/db.h ln -s db51/db_cxx.h ${D}/${includedir}/db_cxx.h - #ln -s db51/dbsql.h ${D}/${includedir}/dbsql.h # The docs end up in /usr/docs - not right. if test -d ${D}/${prefix}/docs @@ -103,6 +109,7 @@ do_install_append() { } INSANE_SKIP_${PN} = dev-so +INSANE_SKIP_${PN}-cxx = dev-so BBCLASSEXTEND = native nativesdk -- 1.8.3.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core] db : Include C++ binding library in Berkeley DB
v2 resolves an rpath issue in the native-sdk. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH v2] db : Include C++ binding library in Berkeley DB recipe.
On Sun, Dec 29, 2013 at 01:27:38PM -0500, Philip Balister wrote: Create the C++ library for db. This library is packaged in a new package so the db package only contains the c library. This prevents existing users from adding libstdc++ to the package DEPENDS. Signed-off-by: Philip Balister phi...@balister.org Signed-off-by: Douglas Geiger doug.gei...@bioradiation.net Signed-off-by: Steve Arnold est...@gentoogeek.org foo ^ bar Signed-off-by: Philip Balister phi...@balister.org --- meta/recipes-support/db/db_5.3.21.bb | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/meta/recipes-support/db/db_5.3.21.bb b/meta/recipes-support/db/db_5.3.21.bb index 328f9db..5abc1fe 100644 --- a/meta/recipes-support/db/db_5.3.21.bb +++ b/meta/recipes-support/db/db_5.3.21.bb @@ -17,7 +17,8 @@ RCONFLICTS_${PN} = db3 SRC_URI = http://download.oracle.com/berkeley-db/db-${PV}.tar.gz; SRC_URI += file://arm-thumb-mutex_db5.patch;patchdir=.. \ -file://fix-parallel-build.patch +file://fix-parallel-build.patch \ + SRC_URI[md5sum] = 3fda0b004acdaa6fa350bfc41a3b95ca SRC_URI[sha256sum] = ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8 @@ -47,18 +48,22 @@ B = ${WORKDIR}/db-${PV}/build_unix # management on the system. inherit lib_package +PACKAGES =+ ${PN}-cxx +FILES_${PN}-cxx = ${libdir}/*cxx*so + + # The dev package has the .so link (as in db3) and the .a's - # it is therefore incompatible (cannot be installed at the # same time) as the db3 package # sort out the .so since they do version prior to the .so SOLIBS = -5*.so -FILES_SOLIBSDEV = ${libdir}/libdb.so +FILES_SOLIBSDEV = ${libdir}/libdb.so ${libdir}/libdb_cxx.so #configuration - set in local.conf to override # All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix) DB5_CONFIG ?= --enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql -EXTRA_OECONF = ${DB5_CONFIG} +EXTRA_OECONF = ${DB5_CONFIG} --enable-shared --enable-cxx # Override the MUTEX setting here, the POSIX library is # the default - POSIX/pthreads/library. @@ -80,16 +85,17 @@ do_configure() { oe_runconf } +do_compile_prepend() { + sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' \ + ${B}/libtool +} + do_install_append() { mkdir -p ${D}/${includedir}/db51 - #mv ${D}/${includedir}/db_185.h ${D}/${includedir}/db51/. mv ${D}/${includedir}/db.h ${D}/${includedir}/db51/. mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db51/. - #mv ${D}/${includedir}/dbsql.h ${D}/${includedir}/db51/. - #ln -s db51/db_185.h ${D}/${includedir}/db_185.h ln -s db51/db.h ${D}/${includedir}/db.h ln -s db51/db_cxx.h ${D}/${includedir}/db_cxx.h - #ln -s db51/dbsql.h ${D}/${includedir}/dbsql.h # The docs end up in /usr/docs - not right. if test -d ${D}/${prefix}/docs @@ -103,6 +109,7 @@ do_install_append() { } INSANE_SKIP_${PN} = dev-so +INSANE_SKIP_${PN}-cxx = dev-so BBCLASSEXTEND = native nativesdk -- 1.8.3.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/38] Cleanup series
On 12/28/13 17:28, Paul Eggleton wrote: I got a bit tired of seeing poor SUMMARY and DESCRIPTION values in our recipes, so I went on a bit of a quest to clean them up, and ended up tidying up a few other things in the process. This might be a good time to remind people of the meta-openembedded/contrib/oe-stylize.py script (which was recently pointed out to me). Unfortunately the style guide to which it points http://openembedded.org/wiki/StyleGuide doesn't appear to exist anymore. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/38] Cleanup series
Hi Trevor, On Sunday 29 December 2013 17:55:18 Trevor Woerner wrote: On 12/28/13 17:28, Paul Eggleton wrote: I got a bit tired of seeing poor SUMMARY and DESCRIPTION values in our recipes, so I went on a bit of a quest to clean them up, and ended up tidying up a few other things in the process. This might be a good time to remind people of the meta-openembedded/contrib/oe-stylize.py script (which was recently pointed out to me). Indeed, thanks for the reminder. Last I heard (from Koen recently IIRC) this script still had some shortcomings though; I have to admit that I haven't used it for years however - I tend to do this kind of thing by hand. Unfortunately the style guide to which it points http://openembedded.org/wiki/StyleGuide doesn't appear to exist anymore. The actual page appears to be named Styleguide. For convenience though I've just added a redirect so the above link now works. I think there are one or two conventions we've established in recent years that aren't covered by that page however (some of which may be covered in my migration document [1]); we also do not need a separate slightly different version on the Yocto Project wiki - I think this was noted some time ago at a previous OE TSC meeting in fact. If I get some time and nobody else gets to it first I'll try to rectify these issues. Cheers, Paul [1] http://www.openembedded.org/wiki/Migrating_metadata_to_OE-Core -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 01/38] *-basic: rename to *-standardlinux - AB Change NEEDED
This will need a heads up to Beth to fix the autobuilder since we build the -basic target for the -lsb builds, it will need to change also. Sau! On 12/28/2013 02:28 PM, Paul Eggleton wrote: This more accurately represents what this image and packagegroup are intended to provide, and avoids confusion with the similarly named core-image-base and packagegroup-base. Part of the fix for [YOCTO #2424]. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-extended/images/core-image-lsb.bb | 2 +- ...-image-basic.bb = core-image-standardlinux.bb} | 2 +- .../packagegroups/packagegroup-core-basic.bb | 138 - .../packagegroup-core-standardlinux.bb | 163 + .../recipes-graphics/images/core-image-directfb.bb | 2 +- 5 files changed, 166 insertions(+), 141 deletions(-) rename meta/recipes-extended/images/{core-image-basic.bb = core-image-standardlinux.bb} (87%) delete mode 100644 meta/recipes-extended/packagegroups/packagegroup-core-basic.bb create mode 100644 meta/recipes-extended/packagegroups/packagegroup-core-standardlinux.bb diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb index f22d199..713a48e 100644 --- a/meta/recipes-extended/images/core-image-lsb.bb +++ b/meta/recipes-extended/images/core-image-lsb.bb @@ -6,7 +6,7 @@ IMAGE_FEATURES += splash ssh-server-openssh hwcodecs package-management IMAGE_INSTALL = \ ${CORE_IMAGE_BASE_INSTALL} \ -packagegroup-core-basic \ +packagegroup-core-standardlinux \ packagegroup-core-lsb \ diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-standardlinux.bb similarity index 87% rename from meta/recipes-extended/images/core-image-basic.bb rename to meta/recipes-extended/images/core-image-standardlinux.bb index d599e72..19985a9 100644 --- a/meta/recipes-extended/images/core-image-basic.bb +++ b/meta/recipes-extended/images/core-image-standardlinux.bb @@ -5,7 +5,7 @@ IMAGE_FEATURES += splash ssh-server-openssh IMAGE_INSTALL = \ packagegroup-core-boot \ -packagegroup-core-basic \ +packagegroup-core-standardlinux \ ${CORE_IMAGE_EXTRA_INSTALL} \ diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb deleted file mode 100644 index c89923d..000 --- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +++ /dev/null @@ -1,138 +0,0 @@ -# -# Copyright (C) 2010 Intel Corporation -# - -DESCRIPTION = Create Basic Image Tasks -PR = r6 -LICENSE = MIT - -inherit packagegroup - -PACKAGES = \ -packagegroup-core-basic \ -packagegroup-core-basic-libs \ -packagegroup-core-basic-utils \ -packagegroup-core-basic-extended \ -packagegroup-core-dev-utils \ -packagegroup-core-multiuser \ -packagegroup-core-initscripts \ -packagegroup-core-sys-services \ - - -python __anonymous () { -# For backwards compatibility after rename -packages = d.getVar(PACKAGES, True).split() -for pkg in packages: -d.appendVar(RPROVIDES_%s % pkg, pkg.replace(packagegroup-core, task-core)) -d.appendVar(RREPLACES_%s % pkg, pkg.replace(packagegroup-core, task-core)) -d.appendVar(RCONFLICTS_%s % pkg, pkg.replace(packagegroup-core, task-core)) -} - - -RDEPENDS_packagegroup-core-basic = \ -packagegroup-core-basic-libs \ -packagegroup-core-basic-utils \ -packagegroup-core-basic-extended \ -packagegroup-core-dev-utils \ -packagegroup-core-multiuser \ -packagegroup-core-initscripts \ -packagegroup-core-sys-services \ - - -RDEPENDS_packagegroup-core-basic-libs = \ -glib-2.0 \ - - -RDEPENDS_packagegroup-core-basic-utils = \ -bash \ -acl \ -attr \ -bc \ -coreutils \ -cpio \ -e2fsprogs \ -ed \ -file \ -findutils \ -gawk \ -gmp \ -grep \ -makedevs \ -mc \ -mc-fish \ -mc-helpers \ -mc-helpers-perl \ -mc-helpers-python \ -mktemp \ -ncurses \ -net-tools \ -pax \ -popt \ -procps \ -psmisc \ -sed \ -tar \ -time \ -util-linux \ -zlib \ - - -RDEPENDS_packagegroup-core-basic-extended = \ -iproute2 \ -iputils \ -iptables \ -module-init-tools \ -openssl \ - - -RDEPENDS_packagegroup-core-dev-utils = \ -byacc \ -diffutils \ -m4 \ -make \ -patch \ - - -VIRTUAL-RUNTIME_initscripts ?= initscripts -VIRTUAL-RUNTIME_init_manager ?= sysvinit -VIRTUAL-RUNTIME_login_manager ?= busybox -VIRTUAL-RUNTIME_syslog ?= sysklogd -RDEPENDS_packagegroup-core-initscripts = \ -${VIRTUAL-RUNTIME_initscripts} \ -${VIRTUAL-RUNTIME_init_manager} \ -ethtool \ -${VIRTUAL-RUNTIME_login_manager} \ -${VIRTUAL-RUNTIME_syslog} \ - - -RDEPENDS_packagegroup-core-multiuser = \ -cracklib \ -
Re: [OE-core] [PATCH 01/38] *-basic: rename to *-standardlinux
Hi Paul, I'm afraid that the standardlinux maybe a little confused with linuxstdbase, bu I don't have any better idea about it. // Robert On 12/29/2013 06:28 AM, Paul Eggleton wrote: This more accurately represents what this image and packagegroup are intended to provide, and avoids confusion with the similarly named core-image-base and packagegroup-base. Part of the fix for [YOCTO #2424]. Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com --- meta/recipes-extended/images/core-image-lsb.bb | 2 +- ...-image-basic.bb = core-image-standardlinux.bb} | 2 +- .../packagegroups/packagegroup-core-basic.bb | 138 - .../packagegroup-core-standardlinux.bb | 163 + .../recipes-graphics/images/core-image-directfb.bb | 2 +- 5 files changed, 166 insertions(+), 141 deletions(-) rename meta/recipes-extended/images/{core-image-basic.bb = core-image-standardlinux.bb} (87%) delete mode 100644 meta/recipes-extended/packagegroups/packagegroup-core-basic.bb create mode 100644 meta/recipes-extended/packagegroups/packagegroup-core-standardlinux.bb diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb index f22d199..713a48e 100644 --- a/meta/recipes-extended/images/core-image-lsb.bb +++ b/meta/recipes-extended/images/core-image-lsb.bb @@ -6,7 +6,7 @@ IMAGE_FEATURES += splash ssh-server-openssh hwcodecs package-management IMAGE_INSTALL = \ ${CORE_IMAGE_BASE_INSTALL} \ -packagegroup-core-basic \ +packagegroup-core-standardlinux \ packagegroup-core-lsb \ diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-standardlinux.bb similarity index 87% rename from meta/recipes-extended/images/core-image-basic.bb rename to meta/recipes-extended/images/core-image-standardlinux.bb index d599e72..19985a9 100644 --- a/meta/recipes-extended/images/core-image-basic.bb +++ b/meta/recipes-extended/images/core-image-standardlinux.bb @@ -5,7 +5,7 @@ IMAGE_FEATURES += splash ssh-server-openssh IMAGE_INSTALL = \ packagegroup-core-boot \ -packagegroup-core-basic \ +packagegroup-core-standardlinux \ ${CORE_IMAGE_EXTRA_INSTALL} \ diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb deleted file mode 100644 index c89923d..000 --- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +++ /dev/null @@ -1,138 +0,0 @@ -# -# Copyright (C) 2010 Intel Corporation -# - -DESCRIPTION = Create Basic Image Tasks -PR = r6 -LICENSE = MIT - -inherit packagegroup - -PACKAGES = \ -packagegroup-core-basic \ -packagegroup-core-basic-libs \ -packagegroup-core-basic-utils \ -packagegroup-core-basic-extended \ -packagegroup-core-dev-utils \ -packagegroup-core-multiuser \ -packagegroup-core-initscripts \ -packagegroup-core-sys-services \ - - -python __anonymous () { -# For backwards compatibility after rename -packages = d.getVar(PACKAGES, True).split() -for pkg in packages: -d.appendVar(RPROVIDES_%s % pkg, pkg.replace(packagegroup-core, task-core)) -d.appendVar(RREPLACES_%s % pkg, pkg.replace(packagegroup-core, task-core)) -d.appendVar(RCONFLICTS_%s % pkg, pkg.replace(packagegroup-core, task-core)) -} - - -RDEPENDS_packagegroup-core-basic = \ -packagegroup-core-basic-libs \ -packagegroup-core-basic-utils \ -packagegroup-core-basic-extended \ -packagegroup-core-dev-utils \ -packagegroup-core-multiuser \ -packagegroup-core-initscripts \ -packagegroup-core-sys-services \ - - -RDEPENDS_packagegroup-core-basic-libs = \ -glib-2.0 \ - - -RDEPENDS_packagegroup-core-basic-utils = \ -bash \ -acl \ -attr \ -bc \ -coreutils \ -cpio \ -e2fsprogs \ -ed \ -file \ -findutils \ -gawk \ -gmp \ -grep \ -makedevs \ -mc \ -mc-fish \ -mc-helpers \ -mc-helpers-perl \ -mc-helpers-python \ -mktemp \ -ncurses \ -net-tools \ -pax \ -popt \ -procps \ -psmisc \ -sed \ -tar \ -time \ -util-linux \ -zlib \ - - -RDEPENDS_packagegroup-core-basic-extended = \ -iproute2 \ -iputils \ -iptables \ -module-init-tools \ -openssl \ - - -RDEPENDS_packagegroup-core-dev-utils = \ -byacc \ -diffutils \ -m4 \ -make \ -patch \ - - -VIRTUAL-RUNTIME_initscripts ?= initscripts -VIRTUAL-RUNTIME_init_manager ?= sysvinit -VIRTUAL-RUNTIME_login_manager ?= busybox -VIRTUAL-RUNTIME_syslog ?= sysklogd -RDEPENDS_packagegroup-core-initscripts = \ -${VIRTUAL-RUNTIME_initscripts} \ -${VIRTUAL-RUNTIME_init_manager} \ -ethtool \ -${VIRTUAL-RUNTIME_login_manager} \ -${VIRTUAL-RUNTIME_syslog} \ - - -RDEPENDS_packagegroup-core-multiuser = \ -cracklib \ -gzip \
[OE-core] [PATCH 2/6] autoconf: remove path_prog_fixes.patch
The path_prog_fixes.patch was used for fixing the perl path, but the do_install_append() can do it, so remove this patch. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../autoconf/autoconf/path_prog_fixes.patch| 128 - meta/recipes-devtools/autoconf/autoconf_2.69.bb| 1 - 2 files changed, 129 deletions(-) delete mode 100644 meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch diff --git a/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch b/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch deleted file mode 100644 index cb57dfd..000 --- a/meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch +++ /dev/null @@ -1,128 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Index: autoconf-2.59/bin/autoheader.in -=== autoconf-2.59.orig/bin/autoheader.in 2005-03-09 16:27:17.933878952 -0500 -+++ autoconf-2.59/bin/autoheader.in2005-03-09 16:29:57.360642400 -0500 -@@ -1,8 +1,8 @@ --#! @PERL@ -+#! @bindir@/env perl - # -*- Perl -*- - # @configure_input@ - --eval 'case $# in 0) exec @PERL@ -S $0;; *) exec @PERL@ -S $0 $@;; esac' -+eval 'case $# in 0) exec @bindir@/env perl -S $0;; *) exec @bindir@/env perl -S $0 $@;; esac' - if 0; - - # autoheader -- create `config.h.in' from `configure.ac' -Index: autoconf-2.59/bin/autom4te.in -=== autoconf-2.59.orig/bin/autom4te.in 2003-10-28 03:48:36.0 -0500 -+++ autoconf-2.59/bin/autom4te.in 2005-03-09 16:30:14.957967200 -0500 -@@ -1,8 +1,10 @@ --#! @PERL@ -w -+#! @bindir@/env perl - # -*- perl -*- - # @configure_input@ - --eval 'case $# in 0) exec @PERL@ -S $0;; *) exec @PERL@ -S $0 $@;; esac' -+use warnings; -+ -+eval 'case $# in 0) exec @bindir@/env perl -S $0;; *) exec @PERL@ -S $0 $@;; esac' - if 0; - - # autom4te - Wrapper around M4 libraries. -@@ -87,7 +89,7 @@ - my $freeze = 0; - - # $M4. --my $m4 = $ENV{M4} || '@M4@'; -+my $m4 = $ENV{M4} || '@bindir@/env m4'; - # Some non-GNU m4's don't reject the --help option, so give them /dev/null. - fatal need GNU m4 1.4 or later: $m4 - if system $m4 --help /dev/null 21 | grep reload-state /dev/null; -Index: autoconf-2.59/bin/autoreconf.in -=== autoconf-2.59.orig/bin/autoreconf.in 2005-03-09 16:27:17.354966960 -0500 -+++ autoconf-2.59/bin/autoreconf.in2005-03-09 16:31:19.572144352 -0500 -@@ -1,8 +1,10 @@ --#! @PERL@ -w -+#! @bindir@/env perl - # -*- perl -*- - # @configure_input@ - --eval 'case $# in 0) exec @PERL@ -S $0;; *) exec @PERL@ -S $0 $@;; esac' -+use warnings; -+ -+eval 'case $# in 0) exec @bindir@/env perl -S $0;; *) exec @PERL@ -S $0 $@;; esac' - if 0; - - # autoreconf - install the GNU Build System in a directory tree -Index: autoconf-2.59/bin/autoscan.in -=== autoconf-2.59.orig/bin/autoscan.in 2003-09-26 08:57:49.0 -0400 -+++ autoconf-2.59/bin/autoscan.in 2005-03-09 16:30:18.136483992 -0500 -@@ -1,4 +1,4 @@ --#! @PERL@ -w -+#! @bindir@/env perl - # -*- perl -*- - # autoscan - Create configure.scan (a preliminary configure.ac) for a package. - # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 -@@ -21,7 +21,9 @@ - - # Written by David MacKenzie d...@gnu.ai.mit.edu. - --eval 'case $# in 0) exec @PERL@ -S $0;; *) exec @PERL@ -S $0 $@;; esac' -+use warnings; -+ -+eval 'case $# in 0) exec @bindir@/env perl -S $0;; *) exec @PERL@ -S $0 $@;; esac' - if 0; - - BEGIN -Index: autoconf-2.59/bin/autoupdate.in -=== autoconf-2.59.orig/bin/autoupdate.in 2003-08-27 07:26:32.0 -0400 -+++ autoconf-2.59/bin/autoupdate.in2005-03-09 16:30:19.912214040 -0500 -@@ -1,4 +1,4 @@ --#! @PERL@ -w -+#! @bindir@/env perl - # -*- perl -*- - # autoupdate - modernize an Autoconf file. - # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 -@@ -22,7 +22,9 @@ - # Originally written by David MacKenzie d...@gnu.ai.mit.edu. - # Rewritten by Akim Demaille a...@freefriends.org. - --eval 'case $# in 0) exec @PERL@ -S $0;; *) exec @PERL@ -S $0 $@;; esac' -+use warnings; -+ -+eval 'case $# in 0) exec @bindir@/env perl -S $0;; *) exec @PERL@ -S $0 $@;; esac' - if 0; - - BEGIN -@@ -54,7 +56,7 @@ - my @include = ('@datadir@'); - my $force = 0; - # m4. --my $m4 = $ENV{M4} || '@M4@'; -+my $m4 = $ENV{M4} || '@bindir@/env m4'; - - - # $HELP -Index: autoconf-2.59/bin/ifnames.in -=== autoconf-2.59.orig/bin/ifnames.in 2003-10-10 09:52:56.0 -0400 -+++ autoconf-2.59/bin/ifnames.in 2005-03-09 16:30:22.656796800 -0500 -@@ -1,8 +1,10 @@ --#! @PERL@ -w -+#! @bindir@/env perl - # -*- perl -*- - # @configure_input@ - --eval 'case $# in 0) exec @PERL@
[OE-core] [PATCH 6/6] git: upgrade to 1.8.5.2
* Upgrade to 1.8.5.2 * Remove the SRC_URI from the git.inc since we use the one in git_1.8.5.2.bb Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-devtools/git/git.inc| 1 - meta/recipes-devtools/git/{git_1.8.4.4.bb = git_1.8.5.2.bb} | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/git/{git_1.8.4.4.bb = git_1.8.5.2.bb} (67%) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index f33069c..7791a7c 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -5,7 +5,6 @@ DEPENDS = openssl curl zlib expat PROVIDES_append_class-native = git-replacement-native -SRC_URI = ${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 S = ${WORKDIR}/git-${PV} LIC_FILES_CHKSUM = file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1 diff --git a/meta/recipes-devtools/git/git_1.8.4.4.bb b/meta/recipes-devtools/git/git_1.8.5.2.bb similarity index 67% rename from meta/recipes-devtools/git/git_1.8.4.4.bb rename to meta/recipes-devtools/git/git_1.8.5.2.bb index cdcd894..4777c46 100644 --- a/meta/recipes-devtools/git/git_1.8.4.4.bb +++ b/meta/recipes-devtools/git/git_1.8.5.2.bb @@ -1,8 +1,9 @@ require git.inc SRC_URI = http://git-core.googlecode.com/files/git-${PV}.tar.gz; -SRC_URI[md5sum] = c07ea15d5d0c31544de265f567d6e5ef -SRC_URI[sha256sum] = 44392f5bfcb17aa943338469ddafd94a9091f8b33eb5d3a2abb60f2bb61d1a73 + +SRC_URI[md5sum] = df8519044f9880f3687d863d99245282 +SRC_URI[sha256sum] = 024694524b8be91fe29afca65bc3a9e40de1322dd5ef2b2c0babb6849c913e8a 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} \ -- 1.8.3.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] make: upgrade to 4.0
Upgrade to 4.0, remove the following patches since they have been fixed by the upgrade: - expand_MAKEFLAGS.patch - intermediate-target-bugfix.patch - make-savannah-bug30612-fix_white_space.patch - make-savannah-bug30612-handling_of_archives.patch Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../make/make-3.82/expand_MAKEFLAGS.patch | 39 - .../make-3.82/intermediate-target-bugfix.patch | 23 --- .../make-savannah-bug30612-fix_white_space.patch | 58 --- ...ke-savannah-bug30612-handling_of_archives.patch | 188 - .../make/{make_3.82.bb = make_4.0.bb} | 10 +- 5 files changed, 2 insertions(+), 316 deletions(-) delete mode 100644 meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch delete mode 100644 meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch delete mode 100644 meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-fix_white_space.patch delete mode 100644 meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-handling_of_archives.patch rename meta/recipes-devtools/make/{make_3.82.bb = make_4.0.bb} (44%) diff --git a/meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch b/meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch deleted file mode 100644 index 941365f..000 --- a/meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Backport [The fix is already in upstream cvs repo, but not in the stable release] - -When working on the self-hosted-image work, I found in the target -bitbake eglibc-initial -c install always failed: - -make[1]: Entering directory `/raid/pe2/build/tmp/work/i586-poky-linux/eglibc-initial-2.13-r18+svnr14157/eglibc-2_13/libc' -/usr/bin/install -c -m 644 include/limits.h /usr/include/limits.h -/usr/bin/install: cannot remove `/usr/include/limits.h': Permission denied -make[1]: *** [/usr/include/limits.h] Error 1 -make[1]: Leaving directory `/raid/pe2/build/tmp/work/i586-poky-linux/eglibc-initial-2.13-r18+svnr14157/eglibc-2_13/libc' -make: *** [install-headers] Error 2 -ERROR: oe_runmake faile - -Debugging shows the install_root variable in eglibc's makefiles is strangely -reset at some place. - -Further investigation shows this is a bug of make-3.82: - -http://savannah.gnu.org/bugs/?30723 -http://cvs.savannah.gnu.org/viewvc/make/main.c?root=maker1=1.243r2=1.244 -http://old.nabble.com/-bug--30723--implicit-re-executing-of-subdirs-breaks-$(origin)-with-make-3.82-td29394353.html - -The patch was got from the second link above(the upstream cvs repo of make). - -Thu Dec 1 16:05:59 CST 2011 -Signed-off-by: Dexuan Cui dexuan@intel.com - -diff -Nru make-3.82.orig//main.c make-3.82/main.c make-3.82.orig//main.c 2010-07-19 15:10:53.0 +0800 -+++ make-3.82/main.c 2011-12-01 16:04:11.818522186 +0800 -@@ -2093,7 +2093,7 @@ - const char *pv = define_makeflags (1, 1); - char *p = alloca (sizeof (MAKEFLAGS=) + strlen (pv) + 1); - sprintf (p, MAKEFLAGS=%s, pv); --putenv (p); -+putenv (allocated_variable_expand (p)); - } - - if (ISDB (DB_BASIC)) diff --git a/meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch b/meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch deleted file mode 100644 index b416e64..000 --- a/meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Backport [The fix is already in upstream git repo, but not in the stable release] - -From fbe5b2c9cd612b962836b9391fa2b58c8baed6fc Mon Sep 17 00:00:00 2001 -From: Paul Smith psm...@gnu.org -Date: Mon, 10 Sep 2012 02:36:05 + -Subject: Force intermediate targets to be considered if their non-intermediate - -parent needs to be remade. Fixes Savannah bug #30653. -diff --git a/remake.c b/remake.c -index c0bf709..b1ddd23 100644 a/remake.c -+++ b/remake.c -@@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth) - d-file-dontcare = file-dontcare; - } - -+/* We may have already considered this file, when we didn't know -+ we'd need to update it. Force update_file() to consider it and -+ not prune it. */ -+d-file-considered = !considered; - - dep_status |= update_file (d-file, depth); diff --git a/meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-fix_white_space.patch b/meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-fix_white_space.patch deleted file mode 100644 index 0ef501f..000 --- a/meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-fix_white_space.patch +++ /dev/null @@ -1,58 +0,0 @@ -Fix another error related to whitespace handling in archives. - -2011-06-12 Paul Smith psm...@gnu.org - -* read.c (parse_file_seq): Move the check for empty members out of -the loop so we can go
[OE-core] [PATCH 0/6] upgrade automake/autogen-native/make/git
I have tested these upgrades on the local autobuilder. // Robert The following changes since commit 5c95cc221aa55df7c25e3254d30a7a4b70ff5359: maintainers.inc: reassign tzcode-native (2013-12-27 19:35:02 +0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/upgrade http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/upgrade Robert Yang (6): automake: upgrade to 1.14 autoconf: remove path_prog_fixes.patch autogen-native: upgrade to 5.18.2 make: remove the obsolete SCCS.patch make: upgrade to 4.0 git: upgrade to 1.8.5.2 .../autoconf/autoconf/path_prog_fixes.patch| 128 -- meta/recipes-devtools/autoconf/autoconf_2.69.bb| 1 - ...n-native_5.17.4.bb = autogen-native_5.18.2.bb} | 6 +- .../autogen/{files = autogen}/guile.patch | 48 +++--- .../increase-timeout-limit.patch | 0 .../automake/automake/path_prog_fixes.patch| 41 - .../prefer-cpio-over-pax-for-ustar-archives.patch | 48 -- .../{automake_1.13.4.bb = automake_1.14.bb} | 14 +- meta/recipes-devtools/git/git.inc | 1 - .../git/{git_1.8.4.4.bb = git_1.8.5.2.bb} | 5 +- meta/recipes-devtools/make/files/SCCS.patch| 17 -- .../make/make-3.82/expand_MAKEFLAGS.patch | 39 - .../make-3.82/intermediate-target-bugfix.patch | 23 --- .../make-savannah-bug30612-fix_white_space.patch | 58 --- ...ke-savannah-bug30612-handling_of_archives.patch | 188 - meta/recipes-devtools/make/make.inc| 3 +- .../make/{make_3.82.bb = make_4.0.bb} | 10 +- 17 files changed, 41 insertions(+), 589 deletions(-) delete mode 100644 meta/recipes-devtools/autoconf/autoconf/path_prog_fixes.patch rename meta/recipes-devtools/autogen/{autogen-native_5.17.4.bb = autogen-native_5.18.2.bb} (88%) rename meta/recipes-devtools/autogen/{files = autogen}/guile.patch (89%) rename meta/recipes-devtools/autogen/{files = autogen}/increase-timeout-limit.patch (100%) delete mode 100644 meta/recipes-devtools/automake/automake/path_prog_fixes.patch delete mode 100644 meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch rename meta/recipes-devtools/automake/{automake_1.13.4.bb = automake_1.14.bb} (75%) rename meta/recipes-devtools/git/{git_1.8.4.4.bb = git_1.8.5.2.bb} (67%) delete mode 100644 meta/recipes-devtools/make/files/SCCS.patch delete mode 100644 meta/recipes-devtools/make/make-3.82/expand_MAKEFLAGS.patch delete mode 100644 meta/recipes-devtools/make/make-3.82/intermediate-target-bugfix.patch delete mode 100644 meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-fix_white_space.patch delete mode 100644 meta/recipes-devtools/make/make-3.82/make-savannah-bug30612-handling_of_archives.patch rename meta/recipes-devtools/make/{make_3.82.bb = make_4.0.bb} (44%) -- 1.8.3.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] make: remove the obsolete SCCS.patch
This patch is used for removing SCCS/*s.conftest, but there is no SCCS directory from 3.81, so remove it. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-devtools/make/files/SCCS.patch | 17 - meta/recipes-devtools/make/make.inc | 3 +-- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 meta/recipes-devtools/make/files/SCCS.patch diff --git a/meta/recipes-devtools/make/files/SCCS.patch b/meta/recipes-devtools/make/files/SCCS.patch deleted file mode 100644 index c7ec3bd..000 --- a/meta/recipes-devtools/make/files/SCCS.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - make-3.80/configure.in~SCCS -+++ make-3.80/configure.in -@@ -264,7 +264,7 @@ -[Define this if the SCCS 'get' command understands the '-Gfile' option.]);; - esac - fi --rm -f s.conftest conftoast -+rm -f s.conftest conftoast SCCS/*s.conftest - - # Check the system to see if it provides GNU glob. If not, use our - # local version. diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index 5de74e4..2e90eca 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,7 +5,6 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = http://www.gnu.org/software/make/; SECTION = devel -SRC_URI = ${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ - file://SCCS.patch +SRC_URI = ${GNU_MIRROR}/make/make-${PV}.tar.bz2 inherit autotools gettext -- 1.8.3.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] automake: upgrade to 1.14
Upgrade from 1.13.4 to 1.14: - Remove the PATHFIXPATCH variable and path_prog_fixes.patch since the problem can be fixed by the do_install_append(). - Remove prefer-cpio-over-pax-for-ustar-archives.patch since it have been fixed by the upgrade. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../automake/automake/path_prog_fixes.patch| 41 -- .../prefer-cpio-over-pax-for-ustar-archives.patch | 48 -- .../{automake_1.13.4.bb = automake_1.14.bb} | 14 ++- 3 files changed, 4 insertions(+), 99 deletions(-) delete mode 100644 meta/recipes-devtools/automake/automake/path_prog_fixes.patch delete mode 100644 meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch rename meta/recipes-devtools/automake/{automake_1.13.4.bb = automake_1.14.bb} (75%) diff --git a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch deleted file mode 100644 index 9ee0672..000 --- a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - - Makefile.am |3 ++- - Makefile.in |3 ++- - aclocal.in |4 ++-- - automake.in |6 -- - 4 files changed, 10 insertions(+), 6 deletions(-) - -Index: automake-1.12.1/aclocal.in -=== automake-1.12.1.orig/aclocal.in -+++ automake-1.12.1/aclocal.in -@@ -1,8 +1,8 @@ --#!@PERL@ -w -+#!@bindir@/env perl - # -*- perl -*- - # @configure_input@ - --eval 'case $# in 0) exec @PERL@ -S $0;; *) exec @PERL@ -S $0 $@;; esac' -+eval 'case $# in 0) exec @bindir@/env perl -S $0;; *) exec @bindir@/env perl -S $0 $@;; esac' - if 0; - - # aclocal - create aclocal.m4 by scanning configure.ac -Index: automake-1.12.1/automake.in -=== automake-1.12.1.orig/automake.in -+++ automake-1.12.1/automake.in -@@ -1,8 +1,10 @@ --#!@PERL@ -w -+#!@bindir@/env perl - # -*- perl -*- - # @configure_input@ - --eval 'case $# in 0) exec @PERL@ -S $0;; *) exec @PERL@ -S $0 $@;; esac' -+use warnings; -+ -+eval 'case $# in 0) exec @bindir@/env perl -S $0;; *) exec @bindir@/env perl -S $0 $@;; esac' - if 0; - - # automake - create Makefile.in from Makefile.am diff --git a/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch b/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch deleted file mode 100644 index 683..000 --- a/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch +++ /dev/null @@ -1,48 +0,0 @@ -When the user has a UID or GID that is larger than the ustar format -supports, pax does not error out gracefully in some cases (FC13). In -this case cpio does. - -See for more details: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8343 - -Additionally drop tar.m4 out of that part of the Makefile or we end up in -a fatal attempt to regen loop: - -CDPATH=${ZSH_VERSION+.}: cd . perllibdir=automake-1.11.1/lib:./lib automake-1.11.1/aclocal --acdir=m4 -I m4 -/bin/sh: automake-1.11.1/aclocal: No such file or directory -make: *** [aclocal.m4] Error 127 - -Upstream-Status: Pending - -Signed-off-by: Tom Rini tom_r...@mentor.com - -Updated for version 1.11.3: -Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com -Date: 2011/03/14 - -Updated for version 1.13.2: -Signed-off-by: Marko Lindqvist cazf...@gmail.com - -diff -Nurd automake-1.13.2/Makefile.in automake-1.13.2/Makefile.in automake-1.13.2/Makefile.in2013-05-15 23:12:58.0 +0300 -+++ automake-1.13.2/Makefile.in2013-05-23 02:13:41.364026301 +0300 -@@ -141,7 +141,7 @@ - $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ - $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ - $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ -- $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac -+ $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -diff -Nurd automake-1.13.2/m4/tar.m4 automake-1.13.2/m4/tar.m4 automake-1.13.2/m4/tar.m4 2013-05-13 23:12:48.0 +0300 -+++ automake-1.13.2/m4/tar.m4 2013-05-23 02:13:26.600025805 +0300 -@@ -26,7 +26,7 @@ - AC_SUBST([AMTAR], ['$${TAR-tar}']) - - # We'll loop over all known methods to create a tar archive until one works. --_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none' - - m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - $$tardir' am__untar='$${TAR-tar} xf -'], \ No newline at end of file diff --git a/meta/recipes-devtools/automake/automake_1.13.4.bb b/meta/recipes-devtools/automake/automake_1.14.bb similarity
[OE-core] [PATCH 3/6] autogen-native: upgrade to 5.18.2
* Upgrade from 5.17.4 to 5.18.2 * Rename files - autogen Signed-off-by: Robert Yang liezhi.y...@windriver.com --- ...n-native_5.17.4.bb = autogen-native_5.18.2.bb} | 6 +-- .../autogen/{files = autogen}/guile.patch | 48 +- .../increase-timeout-limit.patch | 0 3 files changed, 31 insertions(+), 23 deletions(-) rename meta/recipes-devtools/autogen/{autogen-native_5.17.4.bb = autogen-native_5.18.2.bb} (88%) rename meta/recipes-devtools/autogen/{files = autogen}/guile.patch (89%) rename meta/recipes-devtools/autogen/{files = autogen}/increase-timeout-limit.patch (100%) diff --git a/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb similarity index 88% rename from meta/recipes-devtools/autogen/autogen-native_5.17.4.bb rename to meta/recipes-devtools/autogen/autogen-native_5.18.2.bb index 28d82b0..c7950c3 100644 --- a/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb +++ b/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb @@ -6,14 +6,14 @@ DESCRIPTION = AutoGen is a tool designed to simplify the creation and\ HOMEPAGE = http://www.gnu.org/software/autogen/; SECTION = devel LICENSE = GPLv3 -LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 +LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 SRC_URI = ${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ file://guile.patch \ file://increase-timeout-limit.patch -SRC_URI[md5sum] = 09f074cba57610bf4ef1147e01c8ae90 -SRC_URI[sha256sum] = cd2585f4794d0e9d7f2cb0b9af4f2bd429946e718473edf1cf8c49f081ca71ed +SRC_URI[md5sum] = 117c4bc5613c57e1b97d760a5d1910a4 +SRC_URI[sha256sum] = cc2702dec21ba5b01144865163f6d1a54268d2b72aafc5520ad0e0cb57104068 DEPENDS = guile-native libtool-native libxml2-native diff --git a/meta/recipes-devtools/autogen/files/guile.patch b/meta/recipes-devtools/autogen/autogen/guile.patch similarity index 89% rename from meta/recipes-devtools/autogen/files/guile.patch rename to meta/recipes-devtools/autogen/autogen/guile.patch index 8a77dba..332e5aa 100644 --- a/meta/recipes-devtools/autogen/files/guile.patch +++ b/meta/recipes-devtools/autogen/autogen/guile.patch @@ -1,14 +1,24 @@ -Disable the autoconf macros that use dpkg (!) and guile-config to determine what -version and where guile is installed, and just use pkg-config directly (guile-config is a deprecated wrapper around pkg-config). - - Signed-off-by: Ross Burton ross.bur...@intel.com - Upstream-Status: Pending (should be submitted) +remove dpkg and guile-config + +Disable the autoconf macros that use dpkg (!) and guile-config to +determine what version and where guile is installed, and just use +pkg-config directly (guile-config is a deprecated wrapper around +pkg-config). + +Signed-off-by: Ross Burton ross.bur...@intel.com + +Uprade to 5.18.2 +Signed-off-by: Robert Yang liezhi.y...@windriver.com +Upstream-Status: Pending [should be submitted] +--- + config/ag_macros.m4 | 151 +++- + 1 file changed, 8 insertions(+), 143 deletions(-) diff --git a/config/ag_macros.m4 b/config/ag_macros.m4 -index 9914a65..b6db97a 100644 +index c05073e..a8e96da 100644 --- a/config/ag_macros.m4 +++ b/config/ag_macros.m4 -@@ -175,123 +175,12 @@ return 0;], +@@ -180,118 +180,13 @@ return 0;], AC_DEFUN([AG_WITHLIB_GUILE],[ @@ -26,7 +36,12 @@ index 9914a65..b6db97a 100644 -ag_cv_with_libguile_cflags=no -ag_cv_with_libguile_libs=no - else -- ++ PKG_PROG_PKG_CONFIG ++ PKG_CHECK_MODULES(LIBGUILE, [guile-2.0]) ++ case ${LIBGUILE_LIBS} in *-L* ) ++LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ ]*//;s/[ ].*//'` ++ ;; * ) LIBGUILE_PATH='' ;; esac + - AC_ARG_WITH([libguile-cflags], -AS_HELP_STRING([--with-libguile-cflags], [libguile compile flags]), -[ag_cv_with_libguile_cflags=${with_libguile_cflags}], @@ -109,14 +124,10 @@ index 9914a65..b6db97a 100644 - AC_MSG_RESULT([${ag_cv_with_libguile}]) -AC_SUBST([LIBGUILE_CFLAGS]) -AC_SUBST([LIBGUILE_LIBS]) --AC_SUBST([LIBGUILE_PATH]) - if test X${ag_cv_with_libguile} != Xno - then[ - LIBGUILE_CFLAGS=${ag_cv_with_libguile_cflags} -- LIBGUILE_LIBS=${ag_cv_with_libguile_libs} -- case ${LIBGUILE_LIBS} in *-L* ) --LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ ]*//;s/[].*//'` -- ;; * ) LIBGUILE_PATH='' ;; esac] +- LIBGUILE_LIBS=${ag_cv_with_libguile_libs}] - CPPFLAGS=@S|@{ag_save_CPPFLAGS} - LIBS=@S|@{ag_save_LIBS} - else @@ -124,20 +135,14 @@ index 9914a65..b6db97a 100644 -LIBS=${ag_save_LIBS} - LIBGUILE_CFLAGS='' - LIBGUILE_LIBS='' -- LIBGUILE_PATH='' - AC_MSG_ERROR([Cannot find libguile. libguile is required. Perhaps you need to install guile-devel?]) - fi -+ PKG_PROG_PKG_CONFIG -+ PKG_CHECK_MODULES(LIBGUILE, [guile-2.0])
[OE-core] [PATCH 01/14] flac: remove unrecognised options
Remove --disable-id3libtest and --without-id3lib which had been removed from flac for many years, here is the log from flac: commit e31d9eb05cb82bd5f9cab1e6ad5295ddad22bcab Author: Josh Coalson jcoal...@users.sourceforce.net Date: Tue Sep 28 00:23:57 2004 + remove id3 support from the plugins Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-multimedia/flac/flac_1.2.1.bb |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/flac/flac_1.2.1.bb b/meta/recipes-multimedia/flac/flac_1.2.1.bb index 7fd7a03..37c7a97 100644 --- a/meta/recipes-multimedia/flac/flac_1.2.1.bb +++ b/meta/recipes-multimedia/flac/flac_1.2.1.bb @@ -32,13 +32,13 @@ S = ${WORKDIR}/flac-${PV} inherit autotools gettext -EXTRA_OECONF = --disable-oggtest --disable-id3libtest \ +EXTRA_OECONF = --disable-oggtest \ --with-ogg-libraries=${STAGING_LIBDIR} \ --with-ogg-includes=${STAGING_INCDIR} \ --without-xmms-prefix \ --without-xmms-exec-prefix \ --without-libiconv-prefix \ ---without-id3lib + EXTRA_OECONF += ${@bb.utils.contains(TUNE_FEATURES, altivec, --enable-altivec, --disable-altivec, d)} -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/14] alsa-lib: remove unrecognised options
Remove --with-cards and --with-oss, they are never in alsa-lib, but in alsa-driver, and the --with-cards had also been dropped from alsa-driver. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb index 0e1ea76..0087faf 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb @@ -27,7 +27,7 @@ inherit autotools pkgconfig require alsa-fpu.inc EXTRA_OECONF += ${@get_alsa_fpu_setting(bb, d)} -EXTRA_OECONF = --with-cards=pdaudiocf --with-oss=yes --disable-python +EXTRA_OECONF = --disable-python EXTRA_OECONF_append_libc-uclibc = --with-versioned=no -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/14] enchant: fix unrecognised option
Fix the unrecognised option --disable-binreloc, the configure now uses: AM_CONDITIONAL(WITH_BINRELOC, test x$br_cv_binreloc = xyes) We can use br_cv_binreloc=no to fix it. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-support/enchant/enchant_1.6.0.bb |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/enchant/enchant_1.6.0.bb b/meta/recipes-support/enchant/enchant_1.6.0.bb index c16a2a8..5c9359b 100644 --- a/meta/recipes-support/enchant/enchant_1.6.0.bb +++ b/meta/recipes-support/enchant/enchant_1.6.0.bb @@ -17,7 +17,9 @@ SRC_URI = http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz SRC_URI[md5sum] = de11011aff801dc61042828041fb59c7 SRC_URI[sha256sum] = 2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f -EXTRA_OECONF = --with-aspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-aspell --disable-binreloc +EXTRA_OECONF = --with-aspell-prefix=${STAGING_DIR_HOST}${prefix} \ + --enable-aspell br_cv_binreloc=no \ + FILES_${PN} = ${bindir} ${libdir}/*${SOLIBS} ${datadir}/${BPN} ${libdir}/${BPN}/*.so FILES_${PN}-dev += ${libdir}/${BPN}/*{SOLIBSDEV} ${libdir}/${BPN}/*.la -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/14] bluez-hcidump: remove unrecognised options
Remove the following two options since they are not needed any more: * --with-bluez-libs * --with-bluez-includes commit 78631c5f66f0580695ff3aac4dc8831e3795b735 Author: Marcel Holtmann mar...@holtmann.org Date: Wed Aug 31 00:57:30 2011 -0700 Change includes to use local copy of Bluetooth library Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb |2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb b/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb index 6bddcba..8af5c6b 100644 --- a/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb +++ b/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb @@ -17,6 +17,4 @@ SRC_URI[md5sum] = 2eab54bbd2b59a2ed4274ebb9390cf18 SRC_URI[sha256sum] = 9b7c52b375081883738cf049ecabc103b97d094b19c6544fb241267905d1 S = ${WORKDIR}/bluez-hcidump-${PV} -EXTRA_OECONF = --with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} - inherit autotools -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/14] cups: remove unrecognised option
Remove the following 2 options: * --disable-tiff * --with-pdftops The tiff and pdftops filters have been moved into another package cups-filters, so these options are not valid any more. Please visit here for more info: http://www.cups.org/str.php?L3930 Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-extended/cups/cups.inc |2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index cb5b1a7..7a18500 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -25,7 +25,6 @@ EXTRA_OECONF = \ --enable-dbus \ --enable-browsing \ --disable-openssl \ - --disable-tiff \ --disable-gssapi \ --enable-debug \ --disable-relro \ @@ -34,7 +33,6 @@ EXTRA_OECONF = \ --without-perl \ --without-python \ --without-java \ - --with-pdftops=none \ -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/14] fix/remove unrecognised options
The following changes since commit 005af45191ded6185c618c708181b31281e43092: bitbake: fetch2: avoid printing no checksum error message twice (2013-12-22 14:29:13 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/options http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/options Robert Yang (14): flac: remove unrecognised options alsa-lib: remove unrecognised options tremor: remove unrecognised option dpkg: fix/remove unrecognised options libid3tag: remove unrecognised option gstreamer: fix unrecognised options gstreamer1.0: remove unrecognised options gstreamer1.0: remove unrecognised options bluez-hcidump: remove unrecognised options enchant: fix unrecognised option cups: remove unrecognised option wget: remove unrecognised option ghostscript: remove unrecognised option mesa-demos: fix unrecognised options meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb |2 -- meta/recipes-devtools/dpkg/dpkg.inc | 10 +- meta/recipes-extended/cups/cups.inc |2 -- meta/recipes-extended/ghostscript/ghostscript_9.07.bb|8 +--- meta/recipes-extended/wget/wget.inc |2 +- meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb |4 ++-- meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb|2 +- meta/recipes-multimedia/flac/flac_1.2.1.bb |4 ++-- .../gstreamer/gstreamer1.0-plugins-base.inc |2 -- meta/recipes-multimedia/gstreamer/gstreamer1.0.inc |6 +- meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb |6 +- meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb |2 -- meta/recipes-multimedia/tremor/tremor_20120314.bb|2 +- meta/recipes-support/enchant/enchant_1.6.0.bb|4 +++- 14 files changed, 30 insertions(+), 26 deletions(-) -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/14] tremor: remove unrecognised option
Remove the --disable-rpath, it seems taht there is never such an option in tremor's configure, and it uses our libtool, so we don't have to worry about the rpath. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-multimedia/tremor/tremor_20120314.bb |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/tremor/tremor_20120314.bb b/meta/recipes-multimedia/tremor/tremor_20120314.bb index d95fdf1..145316c 100644 --- a/meta/recipes-multimedia/tremor/tremor_20120314.bb +++ b/meta/recipes-multimedia/tremor/tremor_20120314.bb @@ -17,6 +17,6 @@ S = ${WORKDIR}/Tremor inherit autotools -EXTRA_OECONF= --enable-shared --disable-rpath +EXTRA_OECONF = --enable-shared ARM_INSTRUCTION_SET = arm -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/14] dpkg: fix/remove unrecognised options
Fix/remove the following unrecognised options: * --without-static-progs: can't find anything about this in the history, so remove it. * --without-dselect - --disable-dselect * --with-start-stop-daemon - --enable-start-stop-daemon * --with-bz2lib, typo, should be --with-bz2 * --without-sgml-doc: the sgml doc had been removed from dpkg, so remove it. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-devtools/dpkg/dpkg.inc | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index b1da4fb..d5dc412 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -22,14 +22,14 @@ PERL_class-native = ${STAGING_BINDIR_NATIVE}/perl-native/perl export PERL_LIBDIR = ${libdir}/perl PERL_LIBDIR_class-native = ${libdir}/perl-native/perl -EXTRA_OECONF = --without-static-progs \ - --without-dselect \ - --with-start-stop-daemon \ +EXTRA_OECONF = \ + --disable-dselect \ + --enable-start-stop-daemon \ --with-zlib \ - --with-bz2lib \ + --with-bz2 \ --without-liblzma \ --without-selinux \ - --without-sgml-doc + do_configure () { echo ${S}/m4/compiler.m4 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/14] gstreamer: fix unrecognised options
Fix the following options: --disable-docs-build: replace with --disable-docbook --disable-gtk-doc --with-check=no: replace with --disable-check Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb index 90b1982..4282f07 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb @@ -21,7 +21,11 @@ SRC_URI[sha256sum] = e556a529e0a8cf1cd0afd0cab2af5488c9524e7c3f409de29b5d82bb41 inherit autotools pkgconfig gettext GSTREAMER_DEBUG ?= --disable-debug -EXTRA_OECONF = --disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind ${GSTREAMER_DEBUG} +EXTRA_OECONF = --disable-docbook --disable-gtk-doc \ +--disable-dependency-tracking --disable-check \ +--disable-examples --disable-tests \ +--disable-valgrind ${GSTREAMER_DEBUG} \ + # apply gstreamer hack after Makefile.in.in in source is replaced by our version from # ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/14] libid3tag: remove unrecognised option
There is no --enable-speed in libid3tag's configure, but in libmad, and it's already there, so remove it. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb |2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb index d81f58b..38d42b0 100644 --- a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb +++ b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb @@ -20,5 +20,3 @@ SRC_URI[sha256sum] = 63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610 S = ${WORKDIR}/libid3tag-${PV} inherit autotools pkgconfig - -EXTRA_OECONF = -enable-speed -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/14] gstreamer1.0: remove unrecognised options
Remove the following two unrecognised options: * --disable-oggtest * --disable-vorbistest They are defined in m4/ogg.m4 and m4/vorbistest.m4, but now configure doesn't use them, configure.ac uses another way to define the --enable-ogg and --enable-vorbis, and there is no test options, so remove them. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc |2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc index 697b5bd..b56c506 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc @@ -30,8 +30,6 @@ PACKAGECONFIG[pango] = --enable-pango,--disable-pango,pango # cdparanoia and libvisual do not seem to exist anywhere in OE EXTRA_OECONF += \ --disable-freetypetest \ ---disable-oggtest \ ---disable-vorbistest \ --disable-cdparanoia \ --disable-libvisual \ ${GSTREAMER_1_0_ORC} \ -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/14] ghostscript: remove unrecognised option
Remove --without-jasper since the jasper had been removed: commit 6070a6f33bebf7538e48219010bc1e4de8341ea8 Author: Ray Johnston ray.johns...@artifex.com Date: Fri Aug 3 00:32:32 2012 -0700 Rip out jasper -- openjpeg is our JPX implementation. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-extended/ghostscript/ghostscript_9.07.bb |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.07.bb b/meta/recipes-extended/ghostscript/ghostscript_9.07.bb index bd4dd75..3ce9f12 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.07.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.07.bb @@ -35,13 +35,15 @@ SRC_URI_class-native = ${SRC_URI_BASE} \ SRC_URI[md5sum] = 57ebf17c5abcf0fc95a386bfff08c1a4 SRC_URI[sha256sum] = 44800d004c53f13192d1b5db413119198ddfc8a11c4d2a030aac2f2fda822ebf -EXTRA_OECONF = --without-x --with-system-libtiff --without-jbig2dec --without-jasper \ ---with-fontpath=${datadir}/fonts --with-install-cups --without-libidn +EXTRA_OECONF = --without-x --with-system-libtiff --without-jbig2dec \ +--with-fontpath=${datadir}/fonts --with-install-cups \ +--without-libidn \ + # Explicity disable libtiff, fontconfig, # freetype, cups for ghostscript-native EXTRA_OECONF_class-native = --without-x --with-system-libtiff=no \ - --without-jbig2dec --without-jasper \ + --without-jbig2dec \ --with-fontpath=${datadir}/fonts \ --without-libidn --disable-fontconfig \ --disable-freetype --disable-cups -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/14] gstreamer1.0: remove unrecognised options
Fix the following options: --disable-docs-build: replace with --disable-docbook --disable-gtk-doc --with-check=no: --disable-check Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-multimedia/gstreamer/gstreamer1.0.inc |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc index 3cb478a..479fb3a 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc @@ -10,7 +10,11 @@ DEPENDS = glib-2.0 libxml2 bison-native flex-native inherit autotools pkgconfig gettext GSTREAMER_1_DEBUG ?= --disable-debug -EXTRA_OECONF = --disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind ${GSTREAMER_1_DEBUG} +EXTRA_OECONF = --disable-docbook --disable-gtk-doc \ +--disable-dependency-tracking --disable-check \ +--disable-examples --disable-tests \ +--disable-valgrind ${GSTREAMER_1_DEBUG} \ + RRECOMMENDS_${PN}_qemux86+= kernel-module-snd-ens1370 kernel-module-snd-rawmidi RRECOMMENDS_${PN}_qemux86-64 += kernel-module-snd-ens1370 kernel-module-snd-rawmidi -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/14] wget: remove unrecognised option
Remove the --with-libc, I can't find anything about this option from wget's log history. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-extended/wget/wget.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc index 7af55c4..9ef5641 100644 --- a/meta/recipes-extended/wget/wget.inc +++ b/meta/recipes-extended/wget/wget.inc @@ -8,7 +8,7 @@ INC_PR = r16 inherit autotools gettext update-alternatives -EXTRA_OECONF = --with-libc --enable-ipv6 --with-libssl-prefix=${STAGING_DIR_HOST} \ +EXTRA_OECONF = --enable-ipv6 --with-libssl-prefix=${STAGING_DIR_HOST} \ --with-ssl=openssl --disable-rpath --disable-iri \ ac_cv_header_uuid_uuid_h=no -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/14] mesa-demos: fix unrecognised options
Fix two unrecognised options: * --disable-libosmesa - --disable-osmesa * --disable-libx11 - --disable-x11 Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb index 3ac81ef..4bb92f4 100644 --- a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb +++ b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb @@ -34,7 +34,7 @@ PACKAGECONFIG[gbm] = --enable-gbm,--disable-gbm,virtual/libgl PACKAGECONFIG[gles1] = --enable-gles1,--disable-gles1,virtual/libgles1 PACKAGECONFIG[gles2] = --enable-gles2,--disable-gles2,virtual/libgles2 PACKAGECONFIG[glut] = --with-glut,--without-glut, -PACKAGECONFIG[osmesa] = --enable-libosmesa,--disable-libosmesa, +PACKAGECONFIG[osmesa] = --enable-osmesa,--disable-osmesa, PACKAGECONFIG[vg] = --enable-vg,--disable-vg,virtual/libvg PACKAGECONFIG[wayland] = --enable-wayland,--disable-wayland,virtual/libgl wayland -PACKAGECONFIG[x11] = --enable-libx11,--disable-libx11,virtual/libx11 +PACKAGECONFIG[x11] = --enable-x11,--disable-x11,virtual/libx11 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core