* [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list
@ 2011-09-28 7:05 Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 01/29] sysprof: update to version 1.1.8 Saul Wold
` (29 more replies)
0 siblings, 30 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
Richard,
I have reviewed most of these changes, and the current autobuilder built
all the changes except the last batch multilib changes since we don't have
that setup.
Please review the multi-lib change.
There was an issue with the Autobuilder, Mips and Eglibc that I need to
investgate further with Khem, but based on the inital build I think we can
pull it now and fix it shortly.
I think that Josh's ghostscript, Bruce's kernel update and my rpm patches
are suited to be pulled into RC4, other isolated changes are the oprofileui
removal of gnome-vfs and Koen's avahi fix.
Please review and pull as approriate.
Sau!
The following changes since commit 684a4b517d13884c315688967fadd5e6a4845b71:
libffi: really populate -dev package (2011-09-26 20:50:27 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgw/stage
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/stage
Bruce Ashfield (1):
linux-yocto/meta: eg20t and live boot config changes
Dongxiao Xu (6):
multilib.bbclass: map RDEPENDS and LINGUAS_INSTALL for image recipes
multilib: remove the multilib handling to allarch
multilib: add MLPREFIX to deploy folder
tune-i586: fix hardcoded TUNE_PKGARCH
package_rpm: combine normal and multilib solution manifest together
libc-package.bbclass: add MLPREFIX when set values to PACKAGES
Joshua Lock (1):
ghostscript: disable check for time.h
Khem Raj (4):
conf,recipes: Add new variable LINKER_HASH_STYLE
gcc-4.6: Use --with-linker-hash-style configure option
eglibc: Add recipes for 2.14
gcc-4.6: Update to tip of FSF gcc-4_6-branch
Koen Kooi (1):
avahi: fix avahi-systemd dependencies
Richard Purdie (4):
gcc: Fix two QA issues
grub: Fix insane/QA architecture warning
sqlite3: Fix nativesdk packaging/QA warnings
pseudo: Fix QA warnings
Saul Wold (4):
rpm: ensure that magic file is relocatable
zypper & sat-solver: needs RDEPENDS on rpm-lib
rpm: fix QA Warning on installed but not shipped staticdev filesw
distro_tracking: Update Manual Upgrade Checks
Simon Busch (2):
meta: qt4: fix postprocessing of pkg-config files
qt4-embedded: move qte.sh profile script into own package
Tom Zanussi (2):
sysprof: update to version 1.1.8
blktrace: update to version 1.0.3
Zhai Edwin (4):
oprofileui: remove dependence on gnome-vfs
libgsf: remove dependence on gnome-vfs
tables: remove it as obsolete recipe
gnome-vfs: remove it as obsolete recipe in favor of GIO/GVFS
.../recipes-gnome/libgsf/libgsf_1.14.5.bb | 8 +-
meta-demoapps/recipes-graphics/clutter/table.inc | 13 -
.../recipes-graphics/clutter/table/fixes.patch | 16 -
.../recipes-graphics/clutter/table_git.bb | 15 -
meta/classes/libc-package.bbclass | 2 +-
meta/classes/multilib.bbclass | 12 +-
meta/classes/multilib_global.bbclass | 2 +-
meta/classes/package_rpm.bbclass | 15 +-
meta/classes/rootfs_rpm.bbclass | 2 +-
meta/conf/bitbake.conf | 3 +-
.../conf/distro/include/distro_tracking_fields.inc | 88 ++--
meta/conf/distro/include/tcmode-default.inc | 6 +-
meta/conf/machine/include/tune-i586.inc | 3 +-
meta/conf/multilib.conf | 8 +-
meta/recipes-bsp/grub/grub_1.99.bb | 2 +-
meta/recipes-connectivity/avahi/avahi.inc | 4 +-
.../eglibc/cross-localedef-native_2.14.bb | 44 ++
.../eglibc/eglibc-2.14/IO-acquire-lock-fix.patch | 17 +
.../eglibc-2.14/armv4-eabi-compile-fix.patch | 25 +
.../eglibc-2.14/eglibc-rpc-export-again.patch | 69 +++
.../eglibc-svn-arm-lowlevellock-include-tls.patch | 21 +
.../eglibc/eglibc-2.14/generate-supported.mk | 11 +
.../eglibc/eglibc-2.14/ld-search-order.patch | 56 ++
.../eglibc/eglibc-2.14/mips-rld-map-check.patch | 26 +
.../eglibc/eglibc-2.14/multilib_readlib.patch | 17 +
.../recipes-core/eglibc/eglibc-2.14/ppc-sqrt.patch | 538 ++++++++++++++++++++
.../eglibc-2.14/shorten-build-commands.patch | 82 +++
.../eglibc/eglibc-2.14/stack-protector-test.patch | 35 ++
meta/recipes-core/eglibc/eglibc-initial_2.14.bb | 6 +
meta/recipes-core/eglibc/eglibc-locale_2.14.bb | 1 +
meta/recipes-core/eglibc/eglibc_2.14.bb | 219 ++++++++
meta/recipes-core/uclibc/uclibc.inc | 2 +-
meta/recipes-devtools/gcc/gcc-4.6.inc | 8 +-
.../gcc/gcc-4.6/gcc-with-linker-hash-style.patch | 196 +++++++
meta/recipes-devtools/gcc/gcc-package-sdk.inc | 4 +
meta/recipes-devtools/gcc/gcc-package-target.inc | 2 +
meta/recipes-devtools/pseudo/pseudo.inc | 18 +-
.../python/python-pygobject_2.27.91.bb | 2 +-
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 31 +-
.../ghostscript/ghostscript_9.02.bb | 5 +
meta/recipes-extended/libzypp/libzypp_git.bb | 8 +-
meta/recipes-extended/sat-solver/sat-solver_git.bb | 4 +-
meta/recipes-extended/zypper/zypper_git.bb | 6 +-
.../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch | 13 -
.../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch | 53 --
meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb | 50 --
.../blktrace/dso_linking_change_build_fix.patch | 26 -
meta/recipes-kernel/blktrace/blktrace_git.bb | 12 +-
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
meta/recipes-kernel/oprofile/oprofileui.inc | 2 +-
meta/recipes-kernel/sysprof/sysprof_git.bb | 9 +-
meta/recipes-qt/qt4/qt4-embedded.inc | 8 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 4 +-
meta/recipes-support/sqlite/sqlite3.inc | 2 +-
meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb | 2 +-
57 files changed, 1536 insertions(+), 303 deletions(-)
delete mode 100644 meta-demoapps/recipes-graphics/clutter/table.inc
delete mode 100644 meta-demoapps/recipes-graphics/clutter/table/fixes.patch
delete mode 100644 meta-demoapps/recipes-graphics/clutter/table_git.bb
create mode 100644 meta/recipes-core/eglibc/cross-localedef-native_2.14.bb
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/IO-acquire-lock-fix.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/armv4-eabi-compile-fix.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/eglibc-rpc-export-again.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/eglibc-svn-arm-lowlevellock-include-tls.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/etc/ld.so.conf
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/generate-supported.mk
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/mips-rld-map-check.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/multilib_readlib.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/ppc-sqrt.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/shorten-build-commands.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/stack-protector-test.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-initial_2.14.bb
create mode 100644 meta/recipes-core/eglibc/eglibc-locale_2.14.bb
create mode 100644 meta/recipes-core/eglibc/eglibc_2.14.bb
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch
delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb
delete mode 100644 meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch
--
1.7.6
^ permalink raw reply [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 01/29] sysprof: update to version 1.1.8
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 02/29] blktrace: update to version 1.0.3 Saul Wold
` (28 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
Also removes unused SCR_URI checksums.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/recipes-kernel/sysprof/sysprof_git.bb | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index 1af5822..10bde04 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "gtk+ libglade"
-SRCREV = "38a6af1f0a45e528fd2842983da71e0f23c70d6a"
-PR = r1
-PV = "1.1.6+git${SRCPV}"
+SRCREV = "4692f85f625f4fd969cef4ab5dc47cc4655c87f9"
+PR = "r2"
+PV = "1.1.8+git${SRCPV}"
SRC_URI = "git://git.gnome.org/sysprof;protocol=git \
file://define-NT_GNU_BUILD_ID.patch \
@@ -16,9 +16,6 @@ SRC_URI_append_arm = " file://rmb-arm.patch"
SRC_URI_append_mips = " file://rmb-mips.patch"
SRC_URI_append_powerpc = " file://ppc-macro-fix.patch"
-SRC_URI[md5sum] = "80902a7b3d6f7cb83eb6b47e87538747"
-SRC_URI[sha256sum] = "1c6403278fa4f3b37a1fb9f0784e496dce1703fe84ac03b2650bf469133a0cb3"
-
S = "${WORKDIR}/git"
inherit autotools
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 02/29] blktrace: update to version 1.0.3
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 01/29] sysprof: update to version 1.1.8 Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 03/29] avahi: fix avahi-systemd dependencies Saul Wold
` (27 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
This also removes dso_linking_change_build_fix.patch since the same
change has been made upstream.
Also removes unused SRC_URI checksums.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
.../blktrace/dso_linking_change_build_fix.patch | 26 --------------------
meta/recipes-kernel/blktrace/blktrace_git.bb | 12 +++------
2 files changed, 4 insertions(+), 34 deletions(-)
delete mode 100644 meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch
diff --git a/meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch b/meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch
deleted file mode 100644
index 5b74339..0000000
--- a/meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-after gcc linking has changed, all the libraries must be explicitely specified
-This patch avoids this linking error:
-
-| make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/blktrace-1.0.1+git0+1e09f6e9012826fca69fa07222b7bc53c3e629ee-r1/git/btreplay'^M
-| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -I. -I.. -I../btt -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -UCOUNT_IOS -UDEBUG -DNDEBUG -o btreplay btreplay.o -laio -lrt^M
-| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: >: invalid DSO for symbol `pthread_join@@GLIBC_2.0' definition^M
-| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/lib/libpthread.so.0: could not read symbols: Bad value^M
-| collect2: ld returned 1 exit status^M
-| make[1]: *** [btreplay] Error 1
-
-Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: 2011/01/11
-
-Index: git/btreplay/Makefile
-===================================================================
---- git.orig/btreplay/Makefile
-+++ git/btreplay/Makefile
-@@ -11,7 +11,7 @@ XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOU
- override CFLAGS += $(INCS) $(XCFLAGS) $(OCFLAGS)
-
- PROGS = btrecord btreplay
--LIBS = -laio -lrt
-+LIBS = -laio -lrt -lpthread
-
- all: depend $(PROGS)
-
diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb
index 37b7f51..3439a1f 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -4,17 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
DEPENDS = "libaio"
-SRCREV = "1e09f6e9012826fca69fa07222b7bc53c3e629ee"
+SRCREV = "0abccbcb5d1a538028ffcb3869d646d29bf5812b"
-PR = r2
-PV = "1.0.1+git${SRCPV}"
+PR = "r3"
+PV = "1.0.3+git${SRCPV}"
SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=git \
- file://blktrace-makefile.patch \
- file://dso_linking_change_build_fix.patch"
-
-SRC_URI[md5sum] = "588aa9ab8a14d1766ab3f061d728ed89"
-SRC_URI[sha256sum] = "f3cb6a3df1b3dc67369c7c4da3444a7897aa8a18e55937b368e0a6aa2f64b3aa"
+ file://blktrace-makefile.patch"
S = "${WORKDIR}/git"
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 03/29] avahi: fix avahi-systemd dependencies
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 01/29] sysprof: update to version 1.1.8 Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 02/29] blktrace: update to version 1.0.3 Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 04/29] linux-yocto/meta: eg20t and live boot config changes Saul Wold
` (26 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
During the avahi-ui split the RDEPENDS line got dropped leading to: http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/commit/?h=yocto&id=ae0db0eb51bde42f09b9513842c3b745c37c60d5
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/recipes-connectivity/avahi/avahi.inc | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index c3c9c71..5ad9db0 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,7 +14,7 @@ SECTION = "network"
# python scripts are under GPLv2+
LICENSE = "GPLv2+ & LGPLv2.1+"
-INC_PR = "r7"
+INC_PR = "r8"
DEPENDS = "expat libcap libdaemon dbus glib-2.0"
@@ -78,6 +78,8 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
FILES_avahi-utils = "${bindir}/avahi-*"
+RDEPENDS_avahi-systemd = "avahi-daemon"
+
RDEPENDS_avahi-daemon = "sysvinit-pidof"
# uclibc has no nss
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 04/29] linux-yocto/meta: eg20t and live boot config changes
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (2 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 03/29] avahi: fix avahi-systemd dependencies Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 05/29] gcc: Fix two QA issues Saul Wold
` (25 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Merging the following configuration changes:
67a46a6 meta/common-pc-64: enable live booting for common-pc-64
1010905 meta/common-pc: enable live booting for common-pc
b3c5fa7 meta/atom-pc: enable live booting for atom-pc
41c090e meta: update boot live config and move it to cfg/
d51b0e7 eg20t: update config options
The first 4 make the live-boot configuration shared and then reuse
them for the boards that currently are live bootable. The eg20t
is a cleanup of obselete kernel options and is part of the cleanup
of options for the 3.0 kernel.
[YOCTO: #940]
[YOCTO: #686]
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index 2b7a4f9..0c59a5b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
SRCREV_machine ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
SRCREV_machine_qemuppc ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
-SRCREV_meta ?= "0dcdf7bb40a8e1fb18fd27d442fa5ace8cff4941"
+SRCREV_meta ?= "67a46a608f47c19f16995be7de7b272025864b1b"
PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index f11c0ea..9ece25c 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "eccd57eaa4c2b580b9adbbc39e19ecbff56779ae"
SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c"
SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1"
SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e"
-SRCREV_meta ?= "0dcdf7bb40a8e1fb18fd27d442fa5ace8cff4941"
+SRCREV_meta ?= "67a46a608f47c19f16995be7de7b272025864b1b"
PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 05/29] gcc: Fix two QA issues
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (3 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 04/29] linux-yocto/meta: eg20t and live boot config changes Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 06/29] grub: Fix insane/QA architecture warning Saul Wold
` (24 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
a) There is a QA warning from a .so being present in a main package.
In the case of the plugin library for gcc, this is allowed.
b) Remove the unwanted libiberty.a file with the strange path. We
don't need/want this and this removes an unpackaged file warning.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/gcc/gcc-package-sdk.inc | 4 ++++
meta/recipes-devtools/gcc/gcc-package-target.inc | 2 ++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-package-sdk.inc b/meta/recipes-devtools/gcc/gcc-package-sdk.inc
index 8dd4ef7..e2095e3 100644
--- a/meta/recipes-devtools/gcc/gcc-package-sdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-sdk.inc
@@ -19,6 +19,8 @@ FILES_${PN} = "\
${prefix}/${TARGET_SYS}/lib/* \
${prefix}/${TARGET_SYS}/usr/include/* \
"
+INSANE_SKIP_${PN} += "dev-so"
+
FILES_${PN}-doc = "\
${infodir} \
${mandir} \
@@ -40,6 +42,8 @@ do_install () {
# We use libiberty from binutils
rm -f ${D}${prefix}/${TARGET_SYS}/lib/libiberty.a
+ # Not sure where the strange paths come from
+ rm -f ${D}${libdir}/../lib/libiberty.a
rm -f ${D}${libdir}/libiberty.a
# Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
index a0e5da4..f0f1a04 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -24,6 +24,8 @@ FILES_${PN} = "\
${gcclibdir}/${TARGET_SYS}/${BINV}/include \
${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \
"
+INSANE_SKIP_${PN} += "dev-so"
+
FILES_${PN}-dbg += "\
${libexecdir}/gcc/${TARGET_SYS}/${BINV}/.debug/ \
"
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 06/29] grub: Fix insane/QA architecture warning
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (4 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 05/29] gcc: Fix two QA issues Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 07/29] sqlite3: Fix nativesdk packaging/QA warnings Saul Wold
` (23 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
There is QA warning about this package for an architecture mismatch but
this is inappropriate in this case since the bootloader needs 32 and 64
bit code. We therefore flag the QA check to be skipped.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-bsp/grub/grub_1.99.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-bsp/grub/grub_1.99.bb b/meta/recipes-bsp/grub/grub_1.99.bb
index b910b5a..ba41e8f 100644
--- a/meta/recipes-bsp/grub/grub_1.99.bb
+++ b/meta/recipes-bsp/grub/grub_1.99.bb
@@ -41,4 +41,4 @@ do_install_append () {
FILES_${PN}-doc = "${datadir}"
FILES_${PN} = "/usr /etc"
-
+INSANE_SKIP_${PN} = "arch"
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 07/29] sqlite3: Fix nativesdk packaging/QA warnings
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (5 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 06/29] grub: Fix insane/QA architecture warning Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 08/29] pseudo: Fix QA warnings Saul Wold
` (22 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
When building sqlite3-nativesdk, there was a warning about debug files in the
main package. This was due to the order of items in PACKAGES with -dbg after
the main package which breaks an assumption native.bbclass makes. Changing
the order fixes the packaging problem with no change to the normal target
packaging.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-support/sqlite/sqlite3.inc | 2 +-
meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 2a52a44..ece35c5 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -20,7 +20,7 @@ export config_TARGET_LFLAGS = "${LDFLAGS}"
PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
-PACKAGES = "lib${BPN}${PKGSUFFIX} lib${BPN}${PKGSUFFIX}-dev lib${BPN}${PKGSUFFIX}-doc ${PN} ${PN}-dbg"
+PACKAGES = "lib${BPN}${PKGSUFFIX} lib${BPN}${PKGSUFFIX}-dev lib${BPN}${PKGSUFFIX}-doc ${PN}-dbg ${PN}"
FILES_${PN} = "${bindir}/*"
FILES_lib${BPN}${PKGSUFFIX} = "${libdir}/*.so.*"
FILES_lib${BPN}${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb b/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb
index 5651c07..fd03780 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b357
SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz"
S = "${WORKDIR}/sqlite-autoconf-3070701"
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "554026fe7fac47b1cf61c18d5fe43419"
SRC_URI[sha256sum] = "7dcc36b25f7bcbe2938d0ea2baea5b706f0af93473d02a3f612d7ab39e386edf"
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 08/29] pseudo: Fix QA warnings
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (6 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 07/29] sqlite3: Fix nativesdk packaging/QA warnings Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 09/29] meta: qt4: fix postprocessing of pkg-config files Saul Wold
` (21 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
This fixes two QA warnings:
a) Debug files being contained in the main package (by adding
an appropriate FILES expression)
b) Stop hardcoding the RPATH in the nativesdk case since our
path is on the loaders default search path
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/pseudo/pseudo.inc | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
index 0416a53..0c7185b 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -10,8 +10,14 @@ LICENSE = "LGPL2.1"
DEPENDS = "sqlite3"
FILES_${PN} = "${libdir}/libpseudo.so ${bindir}/* ${localstatedir}/pseudo"
+FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
PROVIDES += "virtual/fakeroot"
+# In the nativesdk case, we'll already search the searchpaths
+# pseudo tries to build in so override RPATH
+MAKEOPTS = ""
+MAKEOPTS_virtclass-nativesdk = "'RPATH='"
+
inherit siteinfo
do_configure () {
@@ -27,7 +33,7 @@ do_compile () {
else
${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
fi
- oe_runmake
+ oe_runmake ${MAKEOPTS}
}
# Two below are the same
@@ -37,9 +43,9 @@ do_compile_prepend_virtclass-native () {
if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
# We need the 32-bit libpseudo on a 64-bit machine...
./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
- oe_runmake libpseudo
+ oe_runmake ${MAKEOPTS} libpseudo
# prevent it from removing the lib, but remove everything else
- make 'LIB=foo' distclean
+ make 'LIB=foo' ${MAKEOPTS} distclean
fi
}
@@ -47,14 +53,14 @@ do_compile_prepend_virtclass-nativesdk () {
if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
# We need the 32-bit libpseudo on a 64-bit machine...
./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
- oe_runmake libpseudo
+ oe_runmake ${MAKEOPTS} libpseudo
# prevent it from removing the lib, but remove everything else
- make 'LIB=foo' distclean
+ make 'LIB=foo' ${MAKEOPTS} distclean
fi
}
do_install () {
- oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install
+ oe_runmake 'DESTDIR=${D}' ${MAKEOPTS} 'LIB=lib/pseudo/lib$(MARK64)' install
}
# Two below are the same
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 09/29] meta: qt4: fix postprocessing of pkg-config files
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (7 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 08/29] pseudo: Fix QA warnings Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 10/29] qt4-embedded: move qte.sh profile script into own package Saul Wold
` (20 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Simon Busch <morphis@gravedo.de>
When building qt4-embedded the generated and cleaned pkg-config files for qt are wrong.
The Cflags variable contains something like ${includedir}/qtopia/QtCore where
${includedir} is already /usr/include/qtopia/QtCore.
This patch reverts the fix up of the Cflags variable implemented in do_install.
Signed-off-by: Simon Busch <morphis@gravedo.de>
---
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 4 +---
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 9914c61..1ede922 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.1 | GPLv3"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r30"
+INC_PR = "r31"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 0a714be..a360ec3 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r27"
+INC_PR = "r28"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 5545be7..7f3e1a4 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -293,7 +293,6 @@ do_install() {
-e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
-e s#" -Wl,-rpath-link,${S}/lib"##g \
-e s#" -Wl,-rpath-link,${libdir}"##g \
- -e 's#I/usr/include#Iincludedir}#g' \
-e 's#Iin#I${in#g' \
${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
@@ -310,8 +309,7 @@ do_install() {
# QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here:
for pc in ${D}${libdir}/pkgconfig/*.pc ; do
- sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \
- -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \
+ sed -i -e "s:prefix}include/${QT_DIR_NAME}/$(basename $pc .pc):prefix}/include:" \
-e 's:IP{:I${:g' $pc
done
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 10/29] qt4-embedded: move qte.sh profile script into own package
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (8 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 09/29] meta: qt4: fix postprocessing of pkg-config files Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 11/29] conf, recipes: Add new variable LINKER_HASH_STYLE Saul Wold
` (19 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Simon Busch <morphis@gravedo.de>
We don't want to pull the whole qt suite in our images when only installing a tiny setup
which needs the profile script for several configuration issues. This moves the qte.sh
profile script into a qt4-embedded-conf package which is automatically installed when an
image depends on qt4-embedded.
Signed-off-by: Simon Busch <morphis@gravedo.de>
---
meta/recipes-qt/qt4/qt4-embedded.inc | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 1ede922..ed872b0 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.1 | GPLv3"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r31"
+INC_PR = "r32"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
@@ -27,7 +27,11 @@ do_install_append() {
install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/
}
-FILES_${PN} += " ${sysconfdir}/profile.d/qte.sh"
+# We put the qte profile into it's own package as we don't want to install all qt stuff
+# with depending on the global package qt4-embedded
+PACKAGES += " ${PN}-conf"
+FILES_${PN}-conf += " ${sysconfdir}/profile.d/qte.sh"
+RDEPENDS_${PN} += " ${PN}-conf"
inherit qt4e
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 11/29] conf, recipes: Add new variable LINKER_HASH_STYLE
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (9 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 10/29] qt4-embedded: move qte.sh profile script into own package Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 12/29] gcc-4.6: Use --with-linker-hash-style configure option Saul Wold
` (18 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
LINKER_HASH_STYLE in OE is set to either 'sysv' or 'gnu'
depending upon processor architecture e.g. mips does not support
gnu hash style so is uses sysv
besides 'sysv' and 'gnu' third option is to set it to 'both' we do
not do that by default but user can still set it
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/conf/bitbake.conf | 3 ++-
meta/conf/distro/include/tcmode-default.inc | 6 +++++-
meta/recipes-core/uclibc/uclibc.inc | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 730439c..47e8547 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -476,7 +476,8 @@ BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \
-Wl,-rpath-link,${STAGING_DIR_HOST}${base_libdir} \
-Wl,-rpath,${base_libdir} -Wl,-O1"
-TARGET_LINK_HASH_STYLE ??= ""
+LINKER_HASH_STYLE ??= "gnu"
+TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('LINKER_HASH_STYLE', d, True) == 'gnu']}"
export LDFLAGS = "${TARGET_LDFLAGS}"
export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}"
#export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 2857215..1ddfbce 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -63,5 +63,9 @@ PREFERRED_VERSION_gzip-native ?= "1.4"
# Setup suitable toolchain flags
require conf/distro/include/as-needed.inc
-TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
+# mips does not support GNU hash style therefore we hard assign them
+LINKER_HASH_STYLE_mips = "sysv"
+LINKER_HASH_STYLE_mipsel = "sysv"
+LINKER_HASH_STYLE_mips64 = "sysv"
+LINKER_HASH_STYLE_mips64el = "sysv"
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 222c34f..f104114 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -201,5 +201,5 @@ do_configure() {
do_install() {
oe_runmake PREFIX=${D} install
- oe_runmake PREFIX=${D} "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" install_utils
+ oe_runmake PREFIX=${D} "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" install_utils
}
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 12/29] gcc-4.6: Use --with-linker-hash-style configure option
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (10 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 11/29] conf, recipes: Add new variable LINKER_HASH_STYLE Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 13/29] eglibc: Add recipes for 2.14 Saul Wold
` (17 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Depending upon what hash style is in use this uses
the right flag for setting the hash style type. This
fixes the QA errors about missing GNU hash style reported
in gcc-runtime build particularly libgcc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +
.../gcc/gcc-4.6/gcc-with-linker-hash-style.patch | 196 ++++++++++++++++++++
2 files changed, 198 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index b7b6a43..eef0ef0 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -68,6 +68,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://use-defaults.h-and-t-oe-in-B.patch \
file://powerpc-e5500.patch \
file://fix-for-ice-50099.patch \
+ file://gcc-with-linker-hash-style.patch \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch "
@@ -90,6 +91,7 @@ EXTRA_OECONF_BASE = " --enable-lto \
--disable-bootstrap \
--disable-libgomp \
--disable-libmudflap \
+ --with-linker-hash-style=${LINKER_HASH_STYLE} \
--enable-cheaders=c_global "
EXTRA_OECONF_INITIAL = "--disable-libmudflap \
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch
new file mode 100644
index 0000000..4fa3cbe
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch
@@ -0,0 +1,196 @@
+Upstream-Status: Backport
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+commit 3cb9bbfa927aa187048534f9069202c017a78e38
+Author: ppluzhnikov <ppluzhnikov@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Wed May 11 18:28:14 2011 +0000
+
+ 2011-05-11 Satoru Takabayashi <satorux@google.com>
+ Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ * gcc/doc/install.texi (Configuration): Document
+ --with-linker-hash-style.
+ * gcc/gcc.c (init_spec): Handle LINKER_HASH_STYLE.
+ * gcc/config.in: Add LINKER_HASH_STYLE.
+ * gcc/configure.ac: Add --with-linker-hash-style.
+ * gcc/configure: Regenerate.
+
+
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@173668 138bc75d-0d04-0410-961f-82ee72b054a4
+
+Index: gcc-4_6-branch/gcc/config.in
+===================================================================
+--- gcc-4_6-branch.orig/gcc/config.in 2011-09-09 08:26:10.000000000 -0700
++++ gcc-4_6-branch/gcc/config.in 2011-09-09 08:27:14.142981164 -0700
+@@ -1583,6 +1583,12 @@
+ #endif
+
+
++/* The linker hash style */
++#ifndef USED_FOR_TARGET
++#undef LINKER_HASH_STYLE
++#endif
++
++
+ /* Define to the name of the LTO plugin DSO that must be passed to the
+ linker's -plugin=LIB option. */
+ #ifndef USED_FOR_TARGET
+Index: gcc-4_6-branch/gcc/configure
+===================================================================
+--- gcc-4_6-branch.orig/gcc/configure 2011-09-09 08:26:15.000000000 -0700
++++ gcc-4_6-branch/gcc/configure 2011-09-09 08:27:42.793023181 -0700
+@@ -915,6 +915,7 @@
+ enable_poison_system_directories
+ enable_plugin
+ enable_libquadmath_support
++with_linker_hash_style
+ '
+ ac_precious_vars='build_alias
+ host_alias
+@@ -1667,6 +1668,8 @@
+ with the compiler
+ --with-system-zlib use installed libz
+ --with-slibdir=DIR shared libraries in DIR [LIBDIR]
++ --with-linker-hash-style={sysv,gnu,both}
++ specify the linker hash style
+
+ Some influential environment variables:
+ CC C compiler command
+@@ -17511,7 +17514,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 17514 "configure"
++#line 17517 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -17617,7 +17620,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 17620 "configure"
++#line 17623 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -26434,6 +26437,36 @@
+ fi
+
+
++# Specify what hash style to use by default.
++
++# Check whether --with-linker-hash-style was given.
++if test "${with_linker_hash_style+set}" = set; then :
++ withval=$with_linker_hash_style; case x"$withval" in
++ xsysv)
++ LINKER_HASH_STYLE=sysv
++ ;;
++ xgnu)
++ LINKER_HASH_STYLE=gnu
++ ;;
++ xboth)
++ LINKER_HASH_STYLE=both
++ ;;
++ *)
++ as_fn_error "$withval is an invalid option to --with-linker-hash-style" "$LINENO" 5
++ ;;
++ esac
++else
++ LINKER_HASH_STYLE=''
++fi
++
++if test x"${LINKER_HASH_STYLE}" != x; then
++
++cat >>confdefs.h <<_ACEOF
++#define LINKER_HASH_STYLE "$LINKER_HASH_STYLE"
++_ACEOF
++
++fi
++
+ # Configure the subdirectories
+ # AC_CONFIG_SUBDIRS($subdirs)
+
+Index: gcc-4_6-branch/gcc/configure.ac
+===================================================================
+--- gcc-4_6-branch.orig/gcc/configure.ac 2011-09-09 08:26:15.000000000 -0700
++++ gcc-4_6-branch/gcc/configure.ac 2011-09-09 08:27:14.162981193 -0700
+@@ -4907,6 +4907,30 @@
+ fi
+
+
++# Specify what hash style to use by default.
++AC_ARG_WITH([linker-hash-style],
++[AC_HELP_STRING([--with-linker-hash-style={sysv,gnu,both}],
++ [specify the linker hash style])],
++[case x"$withval" in
++ xsysv)
++ LINKER_HASH_STYLE=sysv
++ ;;
++ xgnu)
++ LINKER_HASH_STYLE=gnu
++ ;;
++ xboth)
++ LINKER_HASH_STYLE=both
++ ;;
++ *)
++ AC_MSG_ERROR([$withval is an invalid option to --with-linker-hash-style])
++ ;;
++ esac],
++[LINKER_HASH_STYLE=''])
++if test x"${LINKER_HASH_STYLE}" != x; then
++ AC_DEFINE_UNQUOTED(LINKER_HASH_STYLE, "$LINKER_HASH_STYLE",
++ [The linker hash style])
++fi
++
+ # Configure the subdirectories
+ # AC_CONFIG_SUBDIRS($subdirs)
+
+Index: gcc-4_6-branch/gcc/doc/install.texi
+===================================================================
+--- gcc-4_6-branch.orig/gcc/doc/install.texi 2011-06-24 08:13:00.000000000 -0700
++++ gcc-4_6-branch/gcc/doc/install.texi 2011-09-09 08:27:14.172981215 -0700
+@@ -1665,6 +1665,11 @@
+ support @option{--build-id} option, a warning is issued and the
+ @option{--enable-linker-build-id} option is ignored. The default is off.
+
++@item --with-linker-hash-style=@var{choice}
++Tells GCC to pass @option{--hash-style=@var{choice}} option to the
++linker for all final links. @var{choice} can be one of
++@samp{sysv}, @samp{gnu}, and @samp{both} where @samp{sysv} is the default.
++
+ @item --enable-gnu-unique-object
+ @itemx --disable-gnu-unique-object
+ Tells GCC to use the gnu_unique_object relocation for C++ template
+Index: gcc-4_6-branch/gcc/gcc.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/gcc.c 2011-09-09 08:26:14.000000000 -0700
++++ gcc-4_6-branch/gcc/gcc.c 2011-09-09 08:27:14.172981215 -0700
+@@ -1427,7 +1427,8 @@
+ }
+ #endif
+
+-#if defined LINK_EH_SPEC || defined LINK_BUILDID_SPEC
++#if defined LINK_EH_SPEC || defined LINK_BUILDID_SPEC || \
++ defined LINKER_HASH_STYLE
+ # ifdef LINK_BUILDID_SPEC
+ /* Prepend LINK_BUILDID_SPEC to whatever link_spec we had before. */
+ obstack_grow (&obstack, LINK_BUILDID_SPEC, sizeof(LINK_BUILDID_SPEC) - 1);
+@@ -1436,6 +1437,16 @@
+ /* Prepend LINK_EH_SPEC to whatever link_spec we had before. */
+ obstack_grow (&obstack, LINK_EH_SPEC, sizeof(LINK_EH_SPEC) - 1);
+ # endif
++# ifdef LINKER_HASH_STYLE
++ /* Prepend --hash-style=LINKER_HASH_STYLE to whatever link_spec we had
++ before. */
++ {
++ static const char hash_style[] = "--hash-style=";
++ obstack_grow (&obstack, hash_style, sizeof(hash_style) - 1);
++ obstack_grow (&obstack, LINKER_HASH_STYLE, sizeof(LINKER_HASH_STYLE) - 1);
++ obstack_1grow (&obstack, ' ');
++ }
++# endif
+ obstack_grow0 (&obstack, link_spec, strlen (link_spec));
+ link_spec = XOBFINISH (&obstack, const char *);
+ #endif
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 13/29] eglibc: Add recipes for 2.14
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (11 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 12/29] gcc-4.6: Use --with-linker-hash-style configure option Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 14/29] gcc-4.6: Update to tip of FSF gcc-4_6-branch Saul Wold
` (16 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Backport Fedora patch to enable sunrpc as it was in 2.13
Fix cross-localedef-native to be able to build from eglibc 2.14 branch
Tested builds/boot of angstrom/console-image on qemu for arm,mips,ppc,i386,x86_64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../eglibc/cross-localedef-native_2.14.bb | 44 ++
.../eglibc/eglibc-2.14/IO-acquire-lock-fix.patch | 17 +
.../eglibc-2.14/armv4-eabi-compile-fix.patch | 25 +
.../eglibc-2.14/eglibc-rpc-export-again.patch | 69 +++
.../eglibc-svn-arm-lowlevellock-include-tls.patch | 21 +
.../eglibc/eglibc-2.14/generate-supported.mk | 11 +
.../eglibc/eglibc-2.14/ld-search-order.patch | 56 ++
.../eglibc/eglibc-2.14/mips-rld-map-check.patch | 26 +
.../eglibc/eglibc-2.14/multilib_readlib.patch | 17 +
.../recipes-core/eglibc/eglibc-2.14/ppc-sqrt.patch | 538 ++++++++++++++++++++
.../eglibc-2.14/shorten-build-commands.patch | 82 +++
.../eglibc/eglibc-2.14/stack-protector-test.patch | 35 ++
meta/recipes-core/eglibc/eglibc-initial_2.14.bb | 6 +
meta/recipes-core/eglibc/eglibc-locale_2.14.bb | 1 +
meta/recipes-core/eglibc/eglibc_2.14.bb | 219 ++++++++
15 files changed, 1167 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-core/eglibc/cross-localedef-native_2.14.bb
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/IO-acquire-lock-fix.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/armv4-eabi-compile-fix.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/eglibc-rpc-export-again.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/eglibc-svn-arm-lowlevellock-include-tls.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/etc/ld.so.conf
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/generate-supported.mk
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/mips-rld-map-check.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/multilib_readlib.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/ppc-sqrt.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/shorten-build-commands.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-2.14/stack-protector-test.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-initial_2.14.bb
create mode 100644 meta/recipes-core/eglibc/eglibc-locale_2.14.bb
create mode 100644 meta/recipes-core/eglibc/eglibc_2.14.bb
diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.14.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.14.bb
new file mode 100644
index 0000000..6f311fc
--- /dev/null
+++ b/meta/recipes-core/eglibc/cross-localedef-native_2.14.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "Cross locale generation tool for eglibc"
+HOMEPAGE = "http://www.eglibc.org/home"
+SECTION = "libs"
+LICENSE = "LGPL"
+
+LIC_DIR = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
+LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9\
+ file://${LIC_DIR}/COPYING;md5=393a5ca445f6965873eca0259a17f833 \
+ file://${LIC_DIR}/posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
+ file://${LIC_DIR}/COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
+
+
+inherit native
+inherit autotools
+
+PR = "r0"
+SRCREV="15225"
+EGLIBC_BRANCH="eglibc-2_14"
+SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http "
+S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef"
+
+do_unpack_append() {
+ bb.build.exec_func('do_move_ports', d)
+}
+
+do_move_ports() {
+ if test -d ${WORKDIR}/${EGLIBC_BRANCH}/ports ; then
+ rm -rf ${WORKDIR}/libc/ports
+ mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${WORKDIR}/libc/
+ fi
+}
+
+EXTRA_OECONF = "--with-glibc=${WORKDIR}/${EGLIBC_BRANCH}/libc"
+CFLAGS += "-DNOT_IN_libc=1"
+
+do_configure () {
+ ./configure ${EXTRA_OECONF}
+}
+
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/localedef ${D}${bindir}/cross-localedef
+}
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/IO-acquire-lock-fix.patch b/meta/recipes-core/eglibc/eglibc-2.14/IO-acquire-lock-fix.patch
new file mode 100644
index 0000000..cf58035
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/IO-acquire-lock-fix.patch
@@ -0,0 +1,17 @@
+import http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
+
+Upstream-Status: Pending
+
+Index: libc/bits/stdio-lock.h
+===================================================================
+--- libc.orig/bits/stdio-lock.h 2009-10-28 14:34:19.000000000 -0700
++++ libc/bits/stdio-lock.h 2009-10-28 14:34:54.000000000 -0700
+@@ -50,6 +50,8 @@ __libc_lock_define_recursive (typedef, _
+ _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \
+ _IO_flockfile (_fp)
+
++# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
++
+ # define _IO_release_lock(_fp) \
+ _IO_funlockfile (_fp); \
+ _IO_cleanup_region_end (0)
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/armv4-eabi-compile-fix.patch b/meta/recipes-core/eglibc/eglibc-2.14/armv4-eabi-compile-fix.patch
new file mode 100644
index 0000000..c2407ee
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/armv4-eabi-compile-fix.patch
@@ -0,0 +1,25 @@
+Source: http://sourceware.org/bugzilla/show_bug.cgi?id=12097
+Upstream-Status: Submitted
+
+The patch should be merged into glibc-ports
+
+-Khem
+Index: libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
+===================================================================
+--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
++++ libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
+@@ -16,6 +16,8 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
++#if defined(__thumb__)
++
+ #include <sysdep.h>
+
+ /* Out-of-line syscall stub. We expect the system call number in ip
+@@ -41,3 +43,5 @@ ENTRY (__libc_do_syscall)
+ pop {r7, pc}
+ .fnend
+ END (__libc_do_syscall)
++
++#endif /* __thumb__ */
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/eglibc-rpc-export-again.patch b/meta/recipes-core/eglibc/eglibc-2.14/eglibc-rpc-export-again.patch
new file mode 100644
index 0000000..24c0a33
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/eglibc-rpc-export-again.patch
@@ -0,0 +1,69 @@
+export the rpc symbols and headers again until we can get libtirpc sorted
+out as a proper and full replacement
+
+patch from fedora (if redhat can't get it to work as the maintainers of all
+these packages, then what chance do we have!)
+
+Index: libc/NEWS
+===================================================================
+--- libc.orig/NEWS 2011-09-09 10:46:36.000000000 -0700
++++ libc/NEWS 2011-09-09 10:58:21.196279725 -0700
+@@ -20,16 +20,6 @@
+ 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,
+ 12795, 12811, 12813, 12814, 12841
+
+-* The RPC implementation in libc is obsoleted. Old programs keep working
+- but new programs cannot be linked with the routines in libc anymore.
+- Programs in need of RPC functionality must be linked against TI-RPC.
+- The TI-RPC implementation is IPv6 enabled and there are other benefits.
+-
+- Visible changes of this change include (obviously) the inability to link
+- programs using RPC functions without referencing the TI-RPC library and the
+- removal of the RPC headers from the glibc headers.
+- Implemented by Ulrich Drepper.
+-
+ * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at,
+ syncfs, setns, sendmmsg
+
+Index: libc/include/libc-symbols.h
+===================================================================
+--- libc.orig/include/libc-symbols.h 2011-09-09 10:45:34.000000000 -0700
++++ libc/include/libc-symbols.h 2011-09-09 10:58:21.196279725 -0700
+@@ -656,7 +656,7 @@
+ # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
+ # define libc_hidden_def(name) hidden_def (name)
+ # define libc_hidden_weak(name) hidden_weak (name)
+-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
++# define libc_hidden_nolink(name, version) hidden_def (name)
+ # define libc_hidden_ver(local, name) hidden_ver (local, name)
+ # define libc_hidden_data_def(name) hidden_data_def (name)
+ # define libc_hidden_data_weak(name) hidden_data_weak (name)
+Index: libc/nis/Makefile
+===================================================================
+--- libc.orig/nis/Makefile 2011-09-09 10:46:34.000000000 -0700
++++ libc/nis/Makefile 2011-09-09 10:58:21.196279725 -0700
+@@ -25,9 +25,9 @@
+
+ aux := nis_hash
+
++headers := $(wildcard rpcsvc/*.[hx])
+ distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
+- nisplus-parser.h nis_xdr.h nss \
+- $(wildcard rpcsvc/*.[hx])
++ nisplus-parser.h nis_xdr.h nss
+
+ # These are the databases available for the nis (and perhaps later nisplus)
+ # service. This must be a superset of the services in nss.
+Index: libc/sunrpc/Makefile
+===================================================================
+--- libc.orig/sunrpc/Makefile 2011-09-09 10:46:30.000000000 -0700
++++ libc/sunrpc/Makefile 2011-09-09 10:59:10.726352375 -0700
+@@ -55,7 +55,7 @@
+ des_crypt.h)
+ headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
+ $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
+-headers = rpc/netdb.h
++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
+ generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
+ $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
+ generated-dirs := rpcsvc
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/eglibc-svn-arm-lowlevellock-include-tls.patch b/meta/recipes-core/eglibc/eglibc-2.14/eglibc-svn-arm-lowlevellock-include-tls.patch
new file mode 100644
index 0000000..4313aa5
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/eglibc-svn-arm-lowlevellock-include-tls.patch
@@ -0,0 +1,21 @@
+In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: warning: implicit declaration of function 'THREAD_GETMEM'
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'THREAD_SELF' undeclared (first use in this function)
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: (Each undeclared identifier is reported only once
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: for each function it appears in.)
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'header' undeclared (first use in this function)
+make[4]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os] Error 1
+
+Upstream-Status: Pending
+
+--- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h.orig
++++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+@@ -25,6 +25,7 @@
+ #include <atomic.h>
+ #include <sysdep.h>
+ #include <kernel-features.h>
++#include <tls.h>
+
+ #define FUTEX_WAIT 0
+ #define FUTEX_WAKE 1
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/etc/ld.so.conf b/meta/recipes-core/eglibc/eglibc-2.14/etc/ld.so.conf
new file mode 100644
index 0000000..e69de29
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/generate-supported.mk b/meta/recipes-core/eglibc/eglibc-2.14/generate-supported.mk
new file mode 100644
index 0000000..d2a28c2
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/generate-supported.mk
@@ -0,0 +1,11 @@
+#!/usr/bin/make
+
+include $(IN)
+
+all:
+ rm -f $(OUT)
+ touch $(OUT)
+ for locale in $(SUPPORTED-LOCALES); do \
+ [ $$locale = true ] && continue; \
+ echo $$locale | sed 's,/, ,' >> $(OUT); \
+ done
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch b/meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch
new file mode 100644
index 0000000..40ae6d3
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch
@@ -0,0 +1,56 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+The default lib search path order is:
+
+ 1) LD_LIBRARY_PATH
+ 2) RPATH from the binary
+ 3) ld.so.cache
+ 4) default search paths embedded in the linker
+
+For nativesdk binaries which are being used alongside binaries on a host system, we
+need the search paths to firstly search the shipped nativesdk libs but then also
+cover the host system. For example we want the host system's libGL and this may be
+in a non-standard location like /usr/lib/mesa. The only place the location is know
+about is in the ld.so.cache of the host system.
+
+Since nativesdk has a simple structure and doesn't need to use a cache itself, we
+repurpose the cache for use as a last resort in finding host system binaries. This
+means we need to switch the order of 3 and 4 above to make this work effectively.
+
+RP 14/10/2010
+
+Index: libc/elf/dl-load.c
+===================================================================
+--- libc.orig/elf/dl-load.c
++++ libc/elf/dl-load.c
+@@ -2107,6 +2107,15 @@ _dl_map_object (struct link_map *loader,
+ &loader->l_runpath_dirs, &realname, &fb, loader,
+ LA_SER_RUNPATH, &found_other_class);
+
++ /* try the default path. */
++ if (fd == -1
++ && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
++ || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
++ && rtld_search_dirs.dirs != (void *) -1)
++ fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
++ &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
++
++ /* Finally try ld.so.cache */
+ if (fd == -1
+ && (__builtin_expect (! (mode & __RTLD_SECURE), 1)
+ || ! INTUSE(__libc_enable_secure)))
+@@ -2169,14 +2178,6 @@ _dl_map_object (struct link_map *loader,
+ }
+ }
+
+- /* Finally, try the default path. */
+- if (fd == -1
+- && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
+- || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
+- && rtld_search_dirs.dirs != (void *) -1)
+- fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
+- &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
+-
+ /* Add another newline when we are tracing the library loading. */
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_LIBS, 0))
+ _dl_debug_printf ("\n");
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/mips-rld-map-check.patch b/meta/recipes-core/eglibc/eglibc-2.14/mips-rld-map-check.patch
new file mode 100644
index 0000000..9b646fe
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/mips-rld-map-check.patch
@@ -0,0 +1,26 @@
+
+On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic
+section if a --version-script sets _RLD_MAP to local. This is apparently
+a binutils bug, but libc shouldn't segfault in this case.
+
+see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615
+
+Upstream-Status: Pending
+
+9/19/2010 - added by Qing He <qing.he@intel.com>
+
+
+---
+diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h
+--- glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h 2009-05-16 16:36:20.000000000 +0800
++++ glibc-2.10.1/ports/sysdeps/mips/dl-machine.h 2010-09-19 09:11:53.000000000 +0800
+@@ -70,7 +70,8 @@
+ /* If there is a DT_MIPS_RLD_MAP entry in the dynamic section, fill it in
+ with the run-time address of the r_debug structure */
+ #define ELF_MACHINE_DEBUG_SETUP(l,r) \
+-do { if ((l)->l_info[DT_MIPS (RLD_MAP)]) \
++do { if ((l)->l_info[DT_MIPS (RLD_MAP)] && \
++ (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) \
+ *(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \
+ (ElfW(Addr)) (r); \
+ } while (0)
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/multilib_readlib.patch b/meta/recipes-core/eglibc/eglibc-2.14/multilib_readlib.patch
new file mode 100644
index 0000000..1542b1b
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/multilib_readlib.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Replace the OECORE_KNOWN_INTERPRETER_NAMES with the value of
+variable EGLIBC_KNOWN_INTERPRETER_NAMES.
+
+Lianhao Lu, 08/01/2011
+
+--- libc/elf/readlib.c.orig 2011-08-12 17:05:51.864470837 +0800
++++ libc/elf/readlib.c 2011-08-12 17:06:39.346942074 +0800
+@@ -52,6 +52,7 @@
+ #ifdef SYSDEP_KNOWN_INTERPRETER_NAMES
+ SYSDEP_KNOWN_INTERPRETER_NAMES
+ #endif
++ OECORE_KNOWN_INTERPRETER_NAMES
+ };
+
+ static struct known_names known_libs[] =
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/ppc-sqrt.patch b/meta/recipes-core/eglibc/eglibc-2.14/ppc-sqrt.patch
new file mode 100644
index 0000000..203040c
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/ppc-sqrt.patch
@@ -0,0 +1,538 @@
+Upstream-Status: Pending
+
+2011-03-22 Joseph Myers <joseph@codesourcery.com>
+
+ Merge from SG++ 2.11:
+
+ 2010-10-05 Nathan Froyd <froydnj@codesourcery.com>
+
+ Issue #9382
+
+ * sysdeps/powerpc/powerpc32/603e/: New directory.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/: New directory.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/: New directory.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/7400/: New directory.
+ * sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c: Update.
+ * sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c: Update.
+ * sysdeps/powerpc/powerpc64/e5500/fpu/Implies: New file.
+
+Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
+@@ -0,0 +1,134 @@
++/* Double-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float two108 = 3.245185536584267269e+32;
++static const float twom54 = 5.551115123125782702e-17;
++static const float half = 0.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the actual square root and half of its reciprocal
++ simultaneously. */
++
++#ifdef __STDC__
++double
++__ieee754_sqrt (double b)
++#else
++double
++__ieee754_sqrt (b)
++ double b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++ double y, g, h, d, r;
++ ieee_double_shape_type u;
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ u.value = b;
++
++ relax_fenv_state ();
++
++ __asm__ ("frsqrte %[estimate], %[x]\n"
++ : [estimate] "=f" (y) : [x] "f" (b));
++
++ /* Following Muller et al, page 168, equation 5.20.
++
++ h goes to 1/(2*sqrt(b))
++ g goes to sqrt(b).
++
++ We need three iterations to get within 1ulp. */
++
++ /* Indicate that these can be performed prior to the branch. GCC
++ insists on sinking them below the branch, however; it seems like
++ they'd be better before the branch so that we can cover any latency
++ from storing the argument and loading its high word. Oh well. */
++
++ g = b * y;
++ h = 0.5 * y;
++
++ /* Handle small numbers by scaling. */
++ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
++ return __ieee754_sqrt (b * two108) * twom54;
++
++#define FMADD(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmadd %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ /* g is now +/- 1ulp, or exactly equal to, the square root of b. */
++
++ /* Final refinement. */
++ d = FNMSUB (g, g, b);
++
++ fesetenv_register (fe);
++ return FMADD (d, h, g);
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l[1] & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_wash (b);
++}
+Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
+@@ -0,0 +1,101 @@
++/* Single-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float threehalf = 1.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the reciprocal square root and use that to compute the actual
++ square root. */
++
++#ifdef __STDC__
++float
++__ieee754_sqrtf (float b)
++#else
++float
++__ieee754_sqrtf (b)
++ float b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++#define FMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ double y, x;
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ relax_fenv_state ();
++
++ /* Compute y = 1.5 * b - b. Uses fewer constants than y = 0.5 * b. */
++ y = FMSUB (threehalf, b, b);
++
++ /* Initial estimate. */
++ __asm__ ("frsqrte %[x], %[b]\n" : [x] "=f" (x) : [b] "f" (b));
++
++ /* Iterate. x_{n+1} = x_n * (1.5 - y * (x_n * x_n)). */
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++
++ /* All done. */
++ fesetenv_register (fe);
++ return x * b;
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l[1] & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_washf (b);
++}
+Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
+@@ -0,0 +1,134 @@
++/* Double-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float two108 = 3.245185536584267269e+32;
++static const float twom54 = 5.551115123125782702e-17;
++static const float half = 0.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the actual square root and half of its reciprocal
++ simultaneously. */
++
++#ifdef __STDC__
++double
++__ieee754_sqrt (double b)
++#else
++double
++__ieee754_sqrt (b)
++ double b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++ double y, g, h, d, r;
++ ieee_double_shape_type u;
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ u.value = b;
++
++ relax_fenv_state ();
++
++ __asm__ ("frsqrte %[estimate], %[x]\n"
++ : [estimate] "=f" (y) : [x] "f" (b));
++
++ /* Following Muller et al, page 168, equation 5.20.
++
++ h goes to 1/(2*sqrt(b))
++ g goes to sqrt(b).
++
++ We need three iterations to get within 1ulp. */
++
++ /* Indicate that these can be performed prior to the branch. GCC
++ insists on sinking them below the branch, however; it seems like
++ they'd be better before the branch so that we can cover any latency
++ from storing the argument and loading its high word. Oh well. */
++
++ g = b * y;
++ h = 0.5 * y;
++
++ /* Handle small numbers by scaling. */
++ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
++ return __ieee754_sqrt (b * two108) * twom54;
++
++#define FMADD(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmadd %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ /* g is now +/- 1ulp, or exactly equal to, the square root of b. */
++
++ /* Final refinement. */
++ d = FNMSUB (g, g, b);
++
++ fesetenv_register (fe);
++ return FMADD (d, h, g);
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l[1] & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_wash (b);
++}
+Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
+@@ -0,0 +1,101 @@
++/* Single-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float threehalf = 1.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the reciprocal square root and use that to compute the actual
++ square root. */
++
++#ifdef __STDC__
++float
++__ieee754_sqrtf (float b)
++#else
++float
++__ieee754_sqrtf (b)
++ float b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++#define FMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ double y, x;
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ relax_fenv_state ();
++
++ /* Compute y = 1.5 * b - b. Uses fewer constants than y = 0.5 * b. */
++ y = FMSUB (threehalf, b, b);
++
++ /* Initial estimate. */
++ __asm__ ("frsqrte %[x], %[b]\n" : [x] "=f" (x) : [b] "f" (b));
++
++ /* Iterate. x_{n+1} = x_n * (1.5 - y * (x_n * x_n)). */
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++
++ /* All done. */
++ fesetenv_register (fe);
++ return x * b;
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l[1] & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_washf (b);
++}
+Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies
+===================================================================
+--- /dev/null
++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc32/603e/fpu
+Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/7400/fpu/Implies
+===================================================================
+--- /dev/null
++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/7400/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc32/603e/fpu
+Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/fpu/Implies
+===================================================================
+--- /dev/null
++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc32/603e/fpu
+Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/e5500/fpu/Implies
+===================================================================
+--- /dev/null
++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/e5500/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc64/e5500/fpu
+Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e5500/fpu/Implies
+===================================================================
+--- /dev/null
++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e5500/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc32/603e/fpu
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/shorten-build-commands.patch b/meta/recipes-core/eglibc/eglibc-2.14/shorten-build-commands.patch
new file mode 100644
index 0000000..080568d
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/shorten-build-commands.patch
@@ -0,0 +1,82 @@
+
+Source: http://sourceware.org/ml/libc-alpha/2010-03/msg00064.html
+
+This patch scratches an itch. Each individual gcc command in the
+glibc build is over 1K, which means it takes up a good chunk of my
+terminal. Most of that is include paths. Any version of GCC new
+enough to build glibc supports response files, which were added in
+2005. So use a response file for the static list of include paths.
+Now the build commands are a lot shorter, and easier to use when
+developing glibc.
+
+Tested on x86_64-linux-gnu. Please apply if acceptable.
+
+--
+Daniel Jacobowitz
+CodeSourcery
+
+2010-03-30 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * Makeconfig (+common-includes): Define.
+ (+includes): Use @$(common-objpfx)includes.
+ * Makefile (postclean): Remove includes and includes.mk.
+ * Makerules ($(common-objpfx)includes.mk): Include and create
+ includes.mk. Create includes.
+
+Upstream-Status: Pending
+
+Index: libc/Makeconfig
+===================================================================
+--- libc.orig/Makeconfig 2009-10-13 22:55:12.000000000 -0700
++++ libc/Makeconfig 2010-03-31 16:02:37.120489733 -0700
+@@ -678,9 +678,10 @@ endif # $(+cflags) == ""
+ # library source directory, in the include directory, and in the
+ # current directory.
+ +sysdep-includes = $(addprefix -I,$(+sysdep_dirs))
+++common-includes = $(+sysdep-includes) $(includes) $(sysincludes)
+ +includes = -I$(..)include $(if $(subdir),$(objpfx:%/=-I%)) \
+- $(+sysdep-includes) $(includes) \
+- $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes)
++ @$(common-objpfx)includes \
++ $(patsubst %/,-I%,$(..)) $(libio-include) -I.
+
+ # Since libio has several internal header files, we use a -I instead
+ # of many little headers in the include directory.
+Index: libc/Makefile
+===================================================================
+--- libc.orig/Makefile 2009-12-09 12:06:28.000000000 -0800
++++ libc/Makefile 2010-03-31 16:02:37.132481508 -0700
+@@ -247,7 +247,7 @@ parent-mostlyclean: common-mostlyclean #
+ parent-clean: parent-mostlyclean common-clean
+
+ postclean = $(addprefix $(common-objpfx),$(postclean-generated)) \
+- $(addprefix $(objpfx),sysd-dirs sysd-rules) \
++ $(addprefix $(objpfx),sysd-dirs sysd-rules includes includes.mk) \
+ $(addprefix $(objpfx),sysd-sorted soversions.mk soversions.i)
+
+ clean: parent-clean
+Index: libc/Makerules
+===================================================================
+--- libc.orig/Makerules 2009-12-09 12:06:28.000000000 -0800
++++ libc/Makerules 2010-03-31 16:02:37.140481645 -0700
+@@ -254,6 +254,20 @@ ifndef sysd-rules-done
+ no_deps=t
+ endif
+
++-include $(common-objpfx)includes.mk
++ifneq ($(+common-includes),$(saved-includes))
++# Recreate includes.mk (and includes).
++includes-force = FORCE
++FORCE:
++endif
++$(common-objpfx)includes.mk: $(includes-force)
++ -@rm -f $@T $(common-objpfx)includesT
++ for inc in $(+common-includes); do echo "$$inc"; done \
++ > $(common-objpfx)includesT
++ mv -f $(common-objpfx)includesT $(common-objpfx)includes
++ echo 'saved-includes := $(+common-includes)' > $@T
++ mv -f $@T $@
++
+ define o-iterator-doit
+ $(objpfx)%$o: %.S $(before-compile); $$(compile-command.S)
+ endef
diff --git a/meta/recipes-core/eglibc/eglibc-2.14/stack-protector-test.patch b/meta/recipes-core/eglibc/eglibc-2.14/stack-protector-test.patch
new file mode 100644
index 0000000..dbf70a9
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.14/stack-protector-test.patch
@@ -0,0 +1,35 @@
+Test for -fstack-protector is compile only test. One might have the option but
+might have build the compiler with --disable-ssp which means ssp should not be
+enabled. Therefore we change the test to a link time test. It will fail if
+libssp is not available.
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: libc/configure
+===================================================================
+--- libc.orig/configure
++++ libc/configure
+@@ -6937,7 +6937,7 @@ if test "${libc_cv_ssp+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -Werror -fstack-protector
+- -o /dev/null -c -x c /dev/null 1>&5'
++ -o /dev/null -x c /dev/null 1>&5'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+Index: libc/configure.in
+===================================================================
+--- libc.orig/configure.in
++++ libc/configure.in
+@@ -1787,7 +1787,7 @@ AC_SUBST(fno_unit_at_a_time)
+
+ AC_CACHE_CHECK(for -fstack-protector, libc_cv_ssp, [dnl
+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Werror -fstack-protector
+- -o /dev/null -c -x c /dev/null 1>&AS_MESSAGE_LOG_FD])
++ -o /dev/null -x c /dev/null 1>&AS_MESSAGE_LOG_FD])
+ then
+ libc_cv_ssp=yes
+ else
diff --git a/meta/recipes-core/eglibc/eglibc-initial_2.14.bb b/meta/recipes-core/eglibc/eglibc-initial_2.14.bb
new file mode 100644
index 0000000..787c762
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-initial_2.14.bb
@@ -0,0 +1,6 @@
+require eglibc_${PV}.bb
+require eglibc-initial.inc
+
+do_configure_prepend () {
+ unset CFLAGS
+}
diff --git a/meta/recipes-core/eglibc/eglibc-locale_2.14.bb b/meta/recipes-core/eglibc/eglibc-locale_2.14.bb
new file mode 100644
index 0000000..ce6c1d2
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-locale_2.14.bb
@@ -0,0 +1 @@
+require eglibc-locale.inc
diff --git a/meta/recipes-core/eglibc/eglibc_2.14.bb b/meta/recipes-core/eglibc/eglibc_2.14.bb
new file mode 100644
index 0000000..b2821db
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc_2.14.bb
@@ -0,0 +1,219 @@
+require eglibc.inc
+
+SRCREV = "15225"
+
+DEPENDS += "gperf-native"
+PR = "r0"
+PR_append = "+svnr${SRCPV}"
+
+EGLIBC_BRANCH="eglibc-2_14"
+SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
+ file://eglibc-svn-arm-lowlevellock-include-tls.patch \
+ file://IO-acquire-lock-fix.patch \
+ file://shorten-build-commands.patch \
+ file://mips-rld-map-check.patch \
+ file://stack-protector-test.patch \
+ file://armv4-eabi-compile-fix.patch \
+ file://etc/ld.so.conf \
+ file://generate-supported.mk \
+ file://ppc-sqrt.patch \
+ file://multilib_readlib.patch \
+ file://eglibc-rpc-export-again.patch \
+ "
+LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
+ file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
+ file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
+ file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
+
+SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch"
+S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+PACKAGES_DYNAMIC = "libc6*"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
+PROVIDES_${PN}-dbg = "glibc-dbg"
+
+# the -isystem in bitbake.conf screws up glibc do_stage
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
+
+GLIBC_ADDONS ?= "ports,nptl,libidn"
+
+GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+ import bb, re
+ uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None)
+ if uc_os:
+ raise bb.parse.SkipPackage("incompatible with target %s" %
+ bb.data.getVar('TARGET_OS', d, 1))
+}
+
+export libc_cv_slibdir = "${base_libdir}"
+
+EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
+ --without-cvs --disable-profile --disable-debug --without-gd \
+ --enable-clocale=gnu \
+ --enable-add-ons=${GLIBC_ADDONS},ports \
+ --with-headers=${STAGING_INCDIR} \
+ --without-selinux \
+ ${GLIBC_EXTRA_OECONF}"
+
+EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
+
+do_unpack_append() {
+ bb.build.exec_func('do_move_ports', d)
+}
+
+do_move_ports() {
+ if test -d ${WORKDIR}/${EGLIBC_BRANCH}/ports ; then
+ rm -rf ${S}/ports
+ mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${S}/
+ fi
+}
+
+do_patch_append() {
+ bb.build.exec_func('do_fix_ia_headers', d)
+ bb.build.exec_func('do_fix_readlib_c', d)
+}
+
+# We need to ensure that all of the i386 and x86_64 headers are identical
+# to support the multilib case. We do this by copying headers from x86_64
+# to i386 directories. Normally when hand building eglibc or a combined
+# system you would build 32-bit, and then overwrite any files with the x86_64
+# versions.
+#
+# Each time eglibc is updated, this will need to be re-evaluated. In order
+# to do this, disable this function. Build eglibc for a 32-bit and a 64-bit
+# IA32 target. Compare the contents of the include files -- comments specific
+# to the x86_64 version compared to the 32-bit one.
+#
+# For eglibc 2.13, each conflict noted below:
+# bits/a.out.h - Add support for __WORDSIZE = 64
+# bits/byteswap.h - Copyright date mismatch, add support for __WORDSIZE = 64
+# bits/endian.h - Comment mismatch
+# bits/environment.h - add support for __WORDSIZE = 64
+# bits/fcntl.h - Comment/Copyright date mismatch, add support for __WORDSIZE = 64
+# bits/fenv.h - Copyright date mismatch, add support for __WORDSIZE = 64
+# bits/huge_vall.h - Comment/Copyright date mismatch, remove support for older gcc
+# bits/link.h - Function name difference, add x86_64 definitions
+# bits/mathdef.h - Copyright date mismatch, add support for __WORDSIZE = 64
+# bits/mathinline.h - Copyright date mismatch, contributed by mismatch, remove support for older gcc/assembly optimization, add support for __WORDSIZE = 64
+# bits/mman.h - Header/Copyright date mismatch, add MAP_32BIT definition
+# bits/msq.h - Copyright date mismatch, add __WORDSIZE = 32 definitions
+# bits/pthread_type.h -- Contributed by added, add support for __WORDSIZE = 64
+# bits/select.h - Copyright date mismatch, add support for __WORDSIZE = 64
+# bits/semaphore.h - Copyright date mismatch, add support for __WORDSIZE = 64
+# bits/sem.h - Copyright date mismatch
+# bits/setjmp.h - Copyrgiht date mismatch, add support for __WORDSIZE = 64
+# bits/shm.h - Copyright date mismatch, add support for __WORDSIZE = 32
+# bits/sigcontext.h - Copyright date mismatch, license wording mismatch, add support for __WORDSIZE = 32
+# bits/stat.h - Copyright date mismatch, add support for __WORDSIZE = 32 and __WORDSIZE = 64
+# bits/string.h - Header/Copyright date mismatch, remove assembly optimizations
+# bits/syscall.h - different order, some different syscalls listed
+# bits/wchar.h - Change the way the definitions are done
+# bits/wordsize.h - Different header, remove license notice, add __x86_64__ support
+# bits/xtitypes.h - Header difference, different typedef format
+# bits/fpu_control.h - header difference, revised comments, updated assembly macros
+# sys/debugreg.h - Copyright date mismatch, new definition and added __WORDSIZE=64 support
+# sys/epoll.h - Copyright date mismatch, slightly different definitions
+# sys/io.h - Copyright date mismatch, slightly different assembly formats
+# sys/perm.h - Copyright date mismatch
+# sys/procfs.h - Copyright date mismatch, support for __WORDSIZE = 32
+# sys/reg.h - Copyright date mismatch, support for __WORDSIZE = 64
+# sys/ucontext.h - Copyright date mismatch, support for __WORDSIZE = 64
+# sys/user.h - Copyright date mismatch, support for __WORDSIZE = 64
+#
+# we rm something to return to the default version
+#
+do_fix_ia_headers() {
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/a.out.h ${S}/sysdeps/unix/sysv/linux/i386/bits/a.out.h
+ cp ${S}/sysdeps/x86_64/bits/byteswap.h ${S}/sysdeps/i386/bits/byteswap.h
+ cp ${S}/sysdeps/x86_64/bits/endian.h ${S}/sysdeps/i386/bits/endian.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/environments.h ${S}/sysdeps/unix/sysv/linux/i386/bits/environments.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h ${S}/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
+ cp ${S}/sysdeps/x86_64/fpu/bits/fenv.h ${S}/sysdeps/i386/fpu/bits/fenv.h
+ rm ${S}/sysdeps/i386/bits/huge_vall.h
+ cp ${S}/sysdeps/x86_64/bits/link.h ${S}/sysdeps/i386/bits/link.h
+ cp ${S}/sysdeps/x86_64/bits/mathdef.h ${S}/sysdeps/i386/bits/mathdef.h
+ cp ${S}/sysdeps/x86_64/fpu/bits/mathinline.h ${S}/sysdeps/i386/fpu/bits/mathinline.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/mman.h ${S}/sysdeps/unix/sysv/linux/i386/bits/mman.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/msq.h ${S}/sysdeps/unix/sysv/linux/i386/bits/msq.h
+ cp ${S}/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h ${S}/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h
+ cp ${S}/sysdeps/x86_64/bits/select.h ${S}/sysdeps/i386/bits/select.h
+ cp ${S}/nptl/sysdeps/unix/sysv/linux/x86_64/bits/semaphore.h ${S}/nptl/sysdeps/unix/sysv/linux/i386/bits/semaphore.h
+ rm ${S}/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
+ cp ${S}/sysdeps/x86_64/bits/setjmp.h ${S}/sysdeps/i386/bits/setjmp.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/shm.h ${S}/sysdeps/unix/sysv/linux/i386/bits/shm.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/sigcontext.h ${S}/sysdeps/unix/sysv/linux/i386/bits/sigcontext.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/stat.h ${S}/sysdeps/unix/sysv/linux/i386/bits/stat.h
+ rm ${S}/sysdeps/i386/i486/bits/string.h ; cp ${S}/sysdeps/x86_64/bits/string.h ${S}/sysdeps/i386/bits/string.h
+ # Skip syscall.h, see do_install
+ rm ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h
+ cp ${S}/sysdeps/x86_64/bits/wordsize.h ${S}/sysdeps/i386/bits/wordsize.h
+ cp ${S}/sysdeps/x86_64/bits/xtitypes.h ${S}/sysdeps/i386/bits/xtitypes.h
+ # i386 version is correct, x86_64 is incorrect for fpu_control.h
+ cp ${S}/sysdeps/i386/fpu_control.h ${S}/sysdeps/x86_64/fpu_control.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h ${S}/sysdeps/unix/sysv/linux/i386/sys/debugreg.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h ${S}/sysdeps/unix/sysv/linux/i386/sys/epoll.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/io.h ${S}/sysdeps/unix/sysv/linux/i386/sys/io.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/perm.h ${S}/sysdeps/unix/sysv/linux/i386/sys/perm.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/procfs.h ${S}/sysdeps/unix/sysv/linux/i386/sys/procfs.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/reg.h ${S}/sysdeps/unix/sysv/linux/i386/sys/reg.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h ${S}/sysdeps/unix/sysv/linux/i386/sys/ucontext.h
+ cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/user.h ${S}/sysdeps/unix/sysv/linux/i386/sys/user.h
+}
+
+do_fix_readlib_c () {
+ sed -i -e 's#OECORE_KNOWN_INTERPRETER_NAMES#${EGLIBC_KNOWN_INTERPRETER_NAMES}#' ${S}/elf/readlib.c
+}
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
+# version check and doesn't really help with anything
+ if [ -z "`which rpcgen`" ]; then
+ echo "rpcgen not found. Install glibc-devel."
+ exit 1
+ fi
+ (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+ find ${S} -name "configure" | xargs touch
+ CPPFLAGS="" oe_runconf
+}
+
+rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
+ yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
+ rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
+
+do_compile () {
+ # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
+ unset LDFLAGS
+ base_do_compile
+ (
+ cd ${S}/sunrpc/rpcsvc
+ for r in ${rpcsvc}; do
+ h=`echo $r|sed -e's,\.x$,.h,'`
+ rpcgen -h $r -o $h || bbwarn "unable to generate header for $r"
+ done
+ )
+ echo "Adjust ldd script"
+ [ -z "${RTLDLIST}" ] && return
+ sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#'
+ sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#'
+
+}
+
+require eglibc-package.inc
+
+BBCLASSEXTEND = "nativesdk"
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 14/29] gcc-4.6: Update to tip of FSF gcc-4_6-branch
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (12 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 13/29] eglibc: Add recipes for 2.14 Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 15/29] rpm: ensure that magic file is relocatable Saul Wold
` (15 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index eef0ef0..a352e36 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r13"
+PR = "r14"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
@@ -16,9 +16,9 @@ PV = "4.6.1+svnr${SRCPV}"
# 4.6.1 then the value below will have 2 which will mean 4.6.2
# which will be next minor release and so on.
-BINV = "4.6.1"
+BINV = "4.6.2"
-SRCREV = 175454
+SRCREV = 178924
BRANCH = "gcc-4_6-branch"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}"
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 15/29] rpm: ensure that magic file is relocatable
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (13 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 14/29] gcc-4.6: Update to tip of FSF gcc-4_6-branch Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 16/29] zypper & sat-solver: needs RDEPENDS on rpm-lib Saul Wold
` (14 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
rpm-native was reading from /usr/share/misc/magic which is wrong
it needs to be set to read from the sysroot. This also adds wrappers
to the rpm-build tools to ensure they know were to find the macros that
point to the right directories.
Fixes [YOCTO #1532]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index a7b360d..356512a 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -44,8 +44,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
extrarpmdeps = "python perl"
-extrarpmdeps_virtclass-native = ""
-PR = "r21"
+extrarpmdeps_virtclass-native = "file-native"
+PR = "r22"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -119,7 +119,7 @@ EXTRA_OECONF = "--verbose \
${WITH_DB} \
${WITH_Z} \
--with-file \
- --with-path-magic=/usr/share/misc/magic \
+ --with-path-magic=%{_usrlibrpm}/../../share/misc/magic \
--without-lua \
--without-tcl \
--with-syck=internal \
@@ -289,6 +289,7 @@ FILES_${PN}-build = "${prefix}/src/rpm \
${libdir}/rpm/vpkg-provides2.sh \
${libdir}/rpm/perfile_rpmdeps.sh \
"
+RDEPENDS_${PN}-build = "file"
#%rpmattr %{_rpmhome}/gem_helper.rb
#%rpmattr %{_rpmhome}/symclash.*
@@ -420,6 +421,13 @@ do_install_append_virtclass-native() {
RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \
RPM_LOCALEDIRRPM=${STAGING_DATADIR_NATIVE}/locale
+ for rpm_binary in ${D}/${libdir}/rpm/bin/rpm*; do
+ create_wrapper $rpm_binary
+ RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \
+ RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \
+ RPM_LOCALEDIRRPM=${STAGING_DATADIR_NATIVE}/locale
+ done
+
# Adjust popt macros to match...
cat ${D}/${libdir}/rpm/rpmpopt | sed -e "s,^\(rpm[^ ]*\)\([ ]\),\1.real\2," > ${D}/${libdir}/rpm/rpmpopt.new
mv ${D}/${libdir}/rpm/rpmpopt.new ${D}/${libdir}/rpm/rpmpopt
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 16/29] zypper & sat-solver: needs RDEPENDS on rpm-lib
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (14 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 15/29] rpm: ensure that magic file is relocatable Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 17/29] rpm: fix QA Warning on installed but not shipped staticdev filesw Saul Wold
` (13 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/libzypp/libzypp_git.bb | 8 ++++----
meta/recipes-extended/sat-solver/sat-solver_git.bb | 4 +++-
meta/recipes-extended/zypper/zypper_git.bb | 6 ++++--
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 4b1b8e4..7d9382a 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -8,13 +8,10 @@ inherit cmake gettext
DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev"
-# rpmdb2solv from sat-solver is run from libzypp
-RDEPENDS_${PN} = "sat-solver"
-
S = "${WORKDIR}/git"
SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
PV = "0.0-git${SRCPV}"
-PR = "r14"
+PR = "r15"
SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
file://no-doc.patch \
@@ -32,6 +29,9 @@ SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
# ARM specific global constructor workaround
SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch"
+# rpmdb2solv from sat-solver is run from libzypp
+RDEPENDS_${PN} = "sat-solver rpm-libs"
+
PACKAGES =+ "${PN}-pkgmgt"
FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons"
diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb
index 0d9a439..b616c57 100644
--- a/meta/recipes-extended/sat-solver/sat-solver_git.bb
+++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb
@@ -8,7 +8,7 @@ DEPENDS = "libcheck rpm zlib expat db"
SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32"
PV = "0.0-git${SRCPV}"
-PR = "r11"
+PR = "r12"
PARALLEL_MAKE=""
@@ -29,6 +29,8 @@ EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
inherit cmake pkgconfig
+RDEPENDS_${PN} = "rpm-libs"
+
PACKAGE_ARCH = "${MACHINE_ARCH}"
do_archgen () {
diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb
index 7f7ceb3..4f4fc4d 100644
--- a/meta/recipes-extended/zypper/zypper_git.bb
+++ b/meta/recipes-extended/zypper/zypper_git.bb
@@ -5,8 +5,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413"
DEPENDS = "libzypp augeas"
-RRECOMMENDS_${PN} = "procps util-linux-uuidgen"
-PR = "r5"
+PR = "r6"
SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582"
inherit cmake
@@ -20,4 +19,7 @@ S = "${WORKDIR}/git"
PV = "1.5.3-git${SRCPV}"
+RDEPENDS_${PN} = "rpm-libs"
+RRECOMMENDS_${PN} = "procps util-linux-uuidgen"
+
PACKAGE_ARCH = "${MACHINE_ARCH}"
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 17/29] rpm: fix QA Warning on installed but not shipped staticdev filesw
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (15 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 16/29] zypper & sat-solver: needs RDEPENDS on rpm-lib Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 18/29] ghostscript: disable check for time.h Saul Wold
` (12 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 356512a..bbef0be 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -168,7 +168,7 @@ EXTRA_OECONF = "--verbose \
CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY"
-PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-common ${PN}-build python-rpm-dbg python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale"
SOLIBS = "5.4.so"
@@ -304,27 +304,30 @@ FILES_perl-module-rpm-dev = "${prefix}/share/man/man3/RPM* \
"
FILE_${PN}-dev = "${includedir}/rpm \
- ${libdir}/librpm.a \
${libdir}/librpm.la \
${libdir}/librpm.so \
- ${libdir}/librpmconstant.a \
${libdir}/librpmconstant.la \
${libdir}/librpmconstant.so \
- ${libdir}/librpmdb.a \
${libdir}/librpmdb.la \
${libdir}/librpmdb.so \
- ${libdir}/librpmio.a \
${libdir}/librpmio.la \
${libdir}/librpmio.so \
- ${libdir}/librpmmisc.a \
${libdir}/librpmmisc.la \
${libdir}/librpmmisc.so \
- ${libdir}/librpmbuild.a \
${libdir}/librpmbuild.la \
${libdir}/librpmbuild.so \
${libdir}/pkgconfig/rpm.pc \
"
+FILE_${PN}-staticdev = " \
+ ${libdir}/librpm.a \
+ ${libdir}/librpmconstant.a \
+ ${libdir}/librpmdb.a \
+ ${libdir}/librpmio.a \
+ ${libdir}/librpmmisc.a \
+ ${libdir}/librpmbuild.a \
+ "
+
###%{_rpmhome}/lib/libxar.a
###%{_rpmhome}/lib/libxar.la
###%{_rpmhome}/lib/libxar.so
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 18/29] ghostscript: disable check for time.h
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (16 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 17/29] rpm: fix QA Warning on installed but not shipped staticdev filesw Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 19/29] distro_tracking: Update Manual Upgrade Checks Saul Wold
` (11 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Joshua Lock <joshual@takoba.(none)>
ghostscript has it's own hacky check for time.h which hard-codes paths, this
means in the native case it fails on systems such as Ubuntu 11.10 where the
location of time.h has changed. Further it means the target build has had a
host-intrusion issue.
This patch disables the check for time.h, future releases of ghostscript
use standard autotools checks for time.h's location.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../ghostscript/ghostscript_9.02.bb | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
index 2e46734..9b21c66 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
@@ -36,6 +36,11 @@ SRC_URI[sha256sum] = "03ea2cad13a36f8f9160912012b79619a826e7148fada6d3531feb2540
EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper --with-fontpath=${datadir}/fonts"
+# This has been fixed upstream but for now we need to subvert the check for time.h
+# http://bugs.ghostscript.com/show_bug.cgi?id=692443
+# http://bugs.ghostscript.com/show_bug.cgi?id=692426
+CFLAGS += "-DHAVE_SYS_TIME_H=1"
+
inherit autotools
do_configure () {
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 19/29] distro_tracking: Update Manual Upgrade Checks
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (17 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 18/29] ghostscript: disable check for time.h Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 20/29] multilib.bbclass: map RDEPENDS and LINGUAS_INSTALL for image recipes Saul Wold
` (10 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 77 ++++++++++++--------
1 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index c1f15e1..47fa7bf 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -409,16 +409,17 @@ RECIPE_COMMENTS_pn-libxml2 = ""
RECIPE_MANUAL_CHECK_DATE_pn-libxml2 = "Jun 06, 2011"
RECIPE_STATUS_pn-readline = "green"
-RECIPE_LAST_UPDATE_pn-readline = "Jun 17, 2010"
+RECIPE_LAST_UPDATE_pn-readline = "May 10, 2011"
RECIPE_MAINTAINER_pn-readline = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-readline = "not done"
-RECIPE_LATEST_VERSION_pn-readline = "6.1"
+RECIPE_LATEST_VERSION_pn-readline = "6.2"
RECIPE_PATCH_pn-readline+configure-fix = "fix configure for build"
RECIPE_PATCH_pn-readline+acinclude.m4 = "local include file for autotools"
RECIPE_INTEL_SECTION_pn-readline = "base libs"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-readline = "11 months"
-RECIPE_LATEST_RELEASE_DATE_pn-readline = "01/2010"
+RECIPE_LATEST_RELEASE_DATE_pn-readline = "Feb 13, 2011"
RECIPE_COMMENTS_pn-readline = ""
+RECIPE_MANUAL_CHECK_DATE_pn-readline = "Sept 27, 2011"
RECIPE_STATUS_pn-libgcrypt = "green"
RECIPE_LAST_UPDATE_pn-libgcrypt = "Jul 29, 2010"
@@ -452,15 +453,15 @@ RECIPE_INTEL_SECTION_pn-lzo = "base libs"
RECIPE_LATEST_RELEASE_DATE_pn-lzo = "10/2010"
RECIPE_STATUS_pn-libtasn1 = "green"
-RECIPE_LAST_UPDATE_pn-libtasn1 = "Nov 16, 2010"
+RECIPE_LAST_UPDATE_pn-libtasn1 = "Dec 06, 2010"
RECIPE_MAINTAINER_pn-libtasn1 = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-libtasn1 = "not done"
RECIPE_LATEST_VERSION_pn-libtasn1 = "2.9"
RECIPE_INTEL_SECTION_pn-libtasn1 = "base libs"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libtasn1 = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-libtasn1 = "05/2010"
+RECIPE_LATEST_RELEASE_DATE_pn-libtasn1 = "Dec 06, 2010"
RECIPE_COMMENTS_pn-libtasn1 = ""
-RECIPE_MANUAL_CHECK_DATE_pn-libtasn1 = "Jun 06, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libtasn1 = "Sep 27, 2011"
RECIPE_STATUS_pn-openssl = "green"
RECIPE_LAST_UPDATE_pn-openssl = "Nov 17, 2010"
@@ -481,9 +482,9 @@ RECIPE_LATEST_RELEASE_DATE_pn-libnss-mdns = "05/2007"
RECIPE_STATUS_pn-ncurses = "green"
RECIPE_LAST_UPDATE_pn-ncurses = "Dec 30, 2010"
RECIPE_MAINTAINER_pn-ncurses = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_LATEST_VERSION_pn-ncurses = "5.7"
+RECIPE_LATEST_VERSION_pn-ncurses = "5.9"
RECIPE_INTEL_SECTION_pn-ncurses = "base libs"
-RECIPE_LATEST_RELEASE_DATE_pn-ncurses = "11/2008"
+RECIPE_LATEST_RELEASE_DATE_pn-ncurses = "Apr 04, 2011"
RECIPE_STATUS_pn-popt = "green"
RECIPE_LAST_UPDATE_pn-popt = "Jul 5, 2010"
@@ -1457,8 +1458,8 @@ RECIPE_DEPENDENCY_CHECK_pn-sysfsutils = "not done"
RECIPE_LATEST_VERSION_pn-sysfsutils = "2.1.0"
RECIPE_INTEL_SECTION_pn-sysfsutils = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sysfsutils = "n/a"
-RECIPE_LATEST_RELEASE_DATE_pn-sysfsutils = "08/2006"
-RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "May 24, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-sysfsutils = "Aug 23, 2006"
+RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "Sep 27, 2011"
RECIPE_COMMENTS_pn-sysfsutils = ""
RECIPE_STATUS_pn-curl = "green"
@@ -1543,14 +1544,14 @@ RECIPE_STATUS_pn-file = "green"
RECIPE_LAST_UPDATE_pn-file = "Jul 12, 2011"
RECIPE_MAINTAINER_pn-file = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-file = "done"
-RECIPE_LATEST_VERSION_pn-file = "5.07"
+RECIPE_LATEST_VERSION_pn-file = "5.09"
RECIPE_PATCH_pn-file+dump = "some new magic data"
RECIPE_PATCH_pn-file+filesystems = "some other new magic data"
RECIPE_INTEL_SECTION_pn-file = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-file = "1-3 months"
-RECIPE_LATEST_RELEASE_DATE_pn-file = "05/2011"
+RECIPE_LATEST_RELEASE_DATE_pn-file = "Sep 16, 2011"
RECIPE_COMMENTS_pn-file = "2-clause BSD"
-RECIPE_MANUAL_CHECK_DATE_pn-file = "Jul 12, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-file = "Sep 27, 2011"
RECIPE_STATUS_pn-rsync = "green"
RECIPE_LAST_UPDATE_pn-rsync = "Jul 6, 2010"
@@ -1655,7 +1656,7 @@ RECIPE_LATEST_VERSION_pn-unzip = "6.0"
RECIPE_INTEL_SECTION_pn-unzip = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-unzip = "49 months"
RECIPE_LATEST_RELEASE_DATE_pn-unzip = "04/2009"
-RECIPE_MANUAL_CHECK_DATE_pn-unzip = "May 24, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-unzip = "Sep 27, 2011"
RECIPE_COMMENTS_pn-unzip = "5.52 has a race condition vulnerability for Unix version"
RECIPE_STATUS_pn-zip = "green"
@@ -1666,7 +1667,7 @@ RECIPE_LATEST_VERSION_pn-zip = "3.0"
RECIPE_INTEL_SECTION_pn-zip = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-zip = "21 months"
RECIPE_LATEST_RELEASE_DATE_pn-zip = "09/2009"
-RECIPE_MANUAL_CHECK_DATE_pn-zip = "May 24, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-zip = "Sep 27, 2011"
RECIPE_COMMENTS_pn-zip = ""
RECIPE_STATUS_pn-strace = "green"
@@ -1756,7 +1757,7 @@ RECIPE_MAINTAINER_pn-util-linux = "Saul Wold <sgw@linux.intel.com>"
RECIPE_LATEST_VERSION_pn-util-linux = "2.19.1"
RECIPE_INTEL_SECTION_pn-util-linux = "base utils"
RECIPE_LATEST_RELEASE_DATE_pn-util-linux = "May 2, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-util-linux = "May 24, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-util-linux = "Sep 27, 2011"
RECIPE_STATUS_pn-usbutils = "green"
RECIPE_LAST_UPDATE_pn-usbutils = "May 20, 2011"
@@ -1804,10 +1805,10 @@ RECIPE_COMMENTS_pn-zypper = ""
DISTRO_PN_ALIAS_pn-zypper = "OpenSuse=zypper Meego=zypper"
RECIPE_STATUS_pn-sysstat = "green"
-RECIPE_LAST_UPDATE_pn-sysstat = "May 24, 2011"
+RECIPE_LAST_UPDATE_pn-sysstat = "Sep 27, 2011"
RECIPE_MAINTAINER_pn-sysstat = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_LATEST_VERSION_pn-sysstat = "10.0.0"
-RECIPE_MANUAL_CHECK_DATE_pn-sysstat = "May 24, 2011"
+RECIPE_LATEST_VERSION_pn-sysstat = "10.0.2"
+RECIPE_MANUAL_CHECK_DATE_pn-sysstat = "Sep 27, 2011"
RECIPE_STATUS_pn-sysklogd = "red" # need upgrade
RECIPE_LAST_UPDATE_pn-sysklogd = "Aug 27, 2010"
@@ -1867,11 +1868,13 @@ RECIPE_LAST_UPDATE_pn-parted = "Jul 28, 2011"
RECIPE_MAINTAINER_pn-parted = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_STATUS_pn-resolvconf = "green"
-RECIPE_LATEST_VERSION_pn-resolvconf = "1.48"
+RECIPE_LATEST_VERSION_pn-resolvconf = "1.59"
+RECIPE_LATEST_RELEASE_DATE_pn-resolvconf = "Sep 26, 2011"
RECIPE_LAST_UPDATE_pn-resolvconf = "Jan 20, 2011"
RECIPE_MAINTAINER_pn-resolvconf = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_MANUAL_CHECK_DATE_pn-resolvconf = "Jun 06, 2011"
-RECIPE_COMMENTS_pn-resolvconf = "Lastest Unstable version is 1.56"
+RECIPE_MANUAL_CHECK_DATE_pn-resolvconf = "Sep 27, 2011"
+RECIPE_NO_UPDATE_REASON_pn-resolvconf = "1.61 is latest UNSTABLE"
+RECIPE_COMMENTS_pn-resolvconf = ""
RECIPE_STATUS_pn-openswan = "red"
RECIPE_LATEST_VERSION_pn-openswan = "2.6.26"
@@ -5615,7 +5618,9 @@ DISTRO_PN_ALIAS_pn-table = "Intel"
RECIPE_STATUS_pn-eds-tools = "red"
DISTRO_PN_ALIAS_pn-eds-tools = "OpenedHand"
RECIPE_LATEST_VERSION_pn-eds-tools = "bzr"
-RECIPE_MANUAL_CHECK_DATE_pn-eds-tools = "May 24, 2011"
+RECIPE_LAST_UPDATE_pn-eds-tools = "Sep 12, 2007"
+RECIPE_MANUAL_CHECK_DATE_pn-eds-tools = "Sep 27, 2011"
+RECIPE_NO_UPDATE_REASON_pn-eds-tools = "Possibly convert to GIT based fetch"
RECIPE_STATUS_pn-abiword-embedded = "red"
DISTRO_PN_ALIAS_pn-abiword-embedded = "Fedora=abiword Ubuntu=abiword"
@@ -5649,22 +5654,32 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-lighttpd = "11 month"
RECIPE_LATEST_RELEASE_DATE_pn-lighttpd = "07/2011"
RECIPE_COMMENTS_pn-lighttpd = ""
-RECIPE_LATEST_VERSION_pn-adt-installer = "1.0"
-RECIPE_MANUAL_CHECK_DATE_pn-adt-installer = "May 24, 2011"
+RECIPE_LATEST_VERSION_pn-adt-installer = "1.1"
+RECIPE_MANUAL_CHECK_DATE_pn-adt-installer = "Sep 27, 2011"
DISTRO_PN_ALIAS_pn-adt-installer = "Intel"
-RECIPE_MAINTAINER_pn-adt-install = "Jessica Zhang <jessica.zhang@intel.com>"
+RECIPE_MAINTAINER_pn-adt-installer = "Jessica Zhang <jessica.zhang@intel.com>"
+
+RECIPE_LATEST_VERSION_pn-glew = "1.7.0"
+RECIPE_LATEST_RELEASE_DATE_pn-glew = "Aug 26, 2011"
+RECIPE_LAST_UPDATE_pn-glew = "May 24, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-glew = "Sep 27, 2011"
-RECIPE_LATEST_VERSION_pn-glew = "1.6.0"
-RECIPE_MANUAL_CHECK_DATE_pn-glew = "May 24, 2011"
RECIPE_LATEST_VERSION_pn-mpeg2dec = "0.5.1"
-RECIPE_NO_UPDATE_REASON_pn-libtheora = "Why are we currently at 0.4.1?"
+RECIPE_NO_UPDATE_REASON_pn-mpeg2dec = "Why are we currently at 0.4.1?"
RECIPE_MANUAL_CHECK_DATE_pn-mpeg2dec = "May 24, 2011"
RECIPE_LATEST_VERSION_pn-lame = "3.98.4"
+
RECIPE_LATEST_VERSION_pn-libmad = "0.15.1b"
-RECIPE_MANUAL_CHECK_DATE_pn-libmad = "May 24, 2011"
+RECIPE_LAST_UPDATE_pn-libmad = "Jul 04, 2006"
+RECIPE_LATEST_RELEASE_DATE_pn-libmad = "Feb 18, 2004
+RECIPE_MANUAL_CHECK_DATE_pn-libmad = "Sep 27, 2011"
+
RECIPE_LATEST_VERSION_pn-libxml-perl = "0.08"
+
RECIPE_LATEST_VERSION_pn-lsb = "1.4"
-RECIPE_MANUAL_CHECK_DATE_pn-lsb = "May 24, 2011"
+RECIPE_LAST_UPDATE_pn-lsb = "Nov 04, 2010"
+RECIPE_LATEST_RELEASE_DATE_pn-lsb = "Jan 04, 2001"
+RECIPE_MANUAL_CHECK_DATE_pn-lsb = "Sep 27, 2011"
RECIPE_NO_UPDATE_REASON_pn-lsb = "1.4 is fixed version of LSB Test"
RECIPE_LATEST_VERSION_pn-lsbsetup = "0.9"
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 20/29] multilib.bbclass: map RDEPENDS and LINGUAS_INSTALL for image recipes
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (18 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 19/29] distro_tracking: Update Manual Upgrade Checks Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 21/29] multilib: remove the multilib handling to allarch Saul Wold
` (9 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
RDEPENDS of image type recipe needs to be mapped to make sure that the
packages included in the image should be multilib version.
Also add LINGUAS_INSTALL into MULTILIB_PACKAGE_INSTALL list.
[YOCTO #1496]
[YOCTO #1527]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/classes/multilib.bbclass | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 98f6911..0ea1038 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -54,9 +54,12 @@ python __anonymous () {
if bb.data.inherits_class('image', d):
map_dependencies("PACKAGE_INSTALL", d)
- pinstall = d.getVar("PACKAGE_INSTALL", True) + " " + d.getVar("MULTILIB_PACKAGE_INSTALL", False)
+ map_dependencies("LINGUAS_INSTALL", d)
+ map_dependencies("RDEPENDS", d)
+ pinstall = d.getVar("LINGUAS_INSTALL", True) + " " + d.getVar("PACKAGE_INSTALL", True) + " " + d.getVar("MULTILIB_PACKAGE_INSTALL", False)
d.setVar("MULTILIB_PACKAGE_INSTALL", pinstall)
d.setVar("PACKAGE_INSTALL", "")
+ d.setVar("LINGUAS_INSTALL", "")
# FIXME, we need to map this to something, not delete it!
d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "")
return
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 21/29] multilib: remove the multilib handling to allarch
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (19 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 20/29] multilib.bbclass: map RDEPENDS and LINGUAS_INSTALL for image recipes Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 22/29] multilib: add MLPREFIX to deploy folder Saul Wold
` (8 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
currently we have allarch type of recipes, which may still have
architecture dependency, like x11-common. So we need to drop the
handling to allarch in multilib case.
Also remove the PV postfix in python-pygobject DEPENDS, since multilib
code will treat a native package multilib capable.
[YOCTO #1497]
[YOCTO #1498]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/classes/multilib.bbclass | 2 +-
meta/classes/multilib_global.bbclass | 2 +-
meta/conf/multilib.conf | 7 +++++++
.../python/python-pygobject_2.27.91.bb | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 0ea1038..6c0dd37 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -8,7 +8,7 @@ python multilib_virtclass_handler () {
return
# There should only be one kernel in multilib configs
- if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data) or bb.data.inherits_class('allarch', e.data):
+ if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data):
raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel")
if bb.data.inherits_class('image', e.data):
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index cd22163..2da66a5 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -5,7 +5,7 @@ python multilib_virtclass_handler_global () {
variant = e.data.getVar("BBEXTENDVARIANT", True)
if isinstance(e, bb.event.RecipeParsed) and not variant:
- if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data) or bb.data.inherits_class('allarch', e.data):
+ if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data):
variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split()
# Process PROVIDES
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 3133bf1..b9da33a 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -452,3 +452,10 @@ BBCLASSEXTEND_append_pn-zip = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-zlib = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-zypper = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-libsdl = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-qemu-config = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-x11-common = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-update-rc.d = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-avahi-ui = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-python-pycairo = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-python-pygtk = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-python-pygobject = " ${MULTILIBS}"
diff --git a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
index 9ff2fe7..fd696a5 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Python GObject bindings"
SECTION = "devel/python"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
-DEPENDS = "python python-pygobject-native-${PV} glib-2.0"
+DEPENDS = "python python-pygobject-native glib-2.0"
DEPENDS_virtclass-native = "glib-2.0-native"
RDEPENDS_virtclass-native = ""
PR = "r2"
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 22/29] multilib: add MLPREFIX to deploy folder
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (20 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 21/29] multilib: remove the multilib handling to allarch Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 23/29] tune-i586: fix hardcoded TUNE_PKGARCH Saul Wold
` (7 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
Add MLPREFIX to multilib deploy forlder to avoid the confliction between
multilib and normal package deploy directory.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/classes/multilib.bbclass | 5 -----
meta/classes/package_rpm.bbclass | 10 ++++++++--
meta/classes/rootfs_rpm.bbclass | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 6c0dd37..1aed2a9 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -92,9 +92,4 @@ python __anonymous () {
multilib_map_variable("PACKAGES_DYNAMIC", variant, d)
multilib_map_variable("PACKAGE_INSTALL", variant, d)
multilib_map_variable("INITSCRIPT_PACKAGES", variant, d)
-
- package_arch = d.getVar("PACKAGE_ARCH", True)
- machine_arch = d.getVar("MACHINE_ARCH", True)
- if package_arch == machine_arch:
- d.setVar("PACKAGE_ARCH", variant + "_" + package_arch)
}
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 775d525..45de0f8 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -903,8 +903,14 @@ python do_package_rpm () {
rpmbuild = bb.data.getVar('RPMBUILD', d, True)
targetsys = bb.data.getVar('TARGET_SYS', d, True)
targetvendor = bb.data.getVar('TARGET_VENDOR', d, True)
- pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d)
- pkgarch = bb.data.expand('${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d)
+ package_arch = bb.data.getVar('PACKAGE_ARCH', d, True) or ""
+ if package_arch not in "all any noarch".split():
+ ml_prefix = (bb.data.getVar('MLPREFIX', d, True) or "").replace("-", "_")
+ bb.data.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch, d)
+ else:
+ bb.data.setVar('PACKAGE_ARCH_EXTEND', package_arch, d)
+ pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}', d)
+ pkgarch = bb.data.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}', d)
magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d)
bb.mkdirhier(pkgwritedir)
os.chmod(pkgwritedir, 0755)
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 5ac6bca..dd370b2 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -220,8 +220,8 @@ python () {
default_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False)
if default_tune:
localdata.setVar("DEFAULTTUNE", default_tune)
- localdata.setVar("MACHINE_ARCH", eext[1] + "_" + localdata.getVar("MACHINE_ARCH", False))
package_archs = localdata.getVar("PACKAGE_ARCHS", True) or ""
+ package_archs = " ".join([i in "all noarch any".split() and i or eext[1]+"_"+i for i in package_archs.split()])
ml_package_archs += " " + package_archs
ml_prefix_list += " " + eext[1]
#bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides))
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 23/29] tune-i586: fix hardcoded TUNE_PKGARCH
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (21 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 22/29] multilib: add MLPREFIX to deploy folder Saul Wold
@ 2011-09-28 7:05 ` Saul Wold
2011-09-28 7:06 ` [CONSOLIDATED PULL 24/29] package_rpm: combine normal and multilib solution manifest together Saul Wold
` (6 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:05 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
Use TUNE_FEATURES to determine the setting to TUNE_PKGARCH, which fixes
the wrong setting of PACKAGE_ARCH in multilib case.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/conf/machine/include/tune-i586.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/conf/machine/include/tune-i586.inc b/meta/conf/machine/include/tune-i586.inc
index ba655b9..a40ce18 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -1,5 +1,6 @@
DEFAULTTUNE ?= "i586"
-TUNE_PKGARCH ?= "i586"
+TUNE_PKGARCH_TMP = "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}"
+TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "i586", "i586", TUNE_PKGARCH_TMP, d)}"
require conf/machine/include/ia32/arch-ia32.inc
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 24/29] package_rpm: combine normal and multilib solution manifest together
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (22 preceding siblings ...)
2011-09-28 7:05 ` [CONSOLIDATED PULL 23/29] tune-i586: fix hardcoded TUNE_PKGARCH Saul Wold
@ 2011-09-28 7:06 ` Saul Wold
2011-09-28 7:06 ` [CONSOLIDATED PULL 25/29] libc-package.bbclass: add MLPREFIX when set values to PACKAGES Saul Wold
` (5 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:06 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
When RPM does the real install, if the first manifest file is empty, the
installation will stop without handling the second manifest file.
Merge the two manifest files together to fix this issue.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/classes/package_rpm.bbclass | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 45de0f8..fa0d8c3 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -395,6 +395,8 @@ package_install_internal_rpm () {
-D "__dbi_txn create nofsync private" \
| grep -i 'Packageorigin' | cut -d : -f 2 > ${target_rootfs}/install/install_multilib_solution.manifest
+ cat ${target_rootfs}/install/install_solution.manifest > ${target_rootfs}/install/total_solution.manifest
+ cat ${target_rootfs}/install/install_multilib_solution.manifest >> ${target_rootfs}/install/total_solution.manifest
# Attempt install
${RPM} --root ${target_rootfs} \
@@ -403,8 +405,7 @@ package_install_internal_rpm () {
-D "_dbpath ${rpmlibdir}" \
--noscripts --notriggers --noparentdirs --nolinktos --replacepkgs \
-D "__dbi_txn create nofsync private" \
- -Uhv ${target_rootfs}/install/install_solution.manifest \
- ${target_rootfs}/install/install_multilib_solution.manifest
+ -Uhv ${target_rootfs}/install/total_solution.manifest
}
python write_specfile () {
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 25/29] libc-package.bbclass: add MLPREFIX when set values to PACKAGES
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (23 preceding siblings ...)
2011-09-28 7:06 ` [CONSOLIDATED PULL 24/29] package_rpm: combine normal and multilib solution manifest together Saul Wold
@ 2011-09-28 7:06 ` Saul Wold
2011-09-28 7:06 ` [CONSOLIDATED PULL 26/29] oprofileui: remove dependence on gnome-vfs Saul Wold
` (4 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:06 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
There are some places that PACKAGES are dynamically set. To support
multilib, we need to add MLPREFIX before the package name in those
settings.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/classes/libc-package.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 9d32844..71a577b 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -311,7 +311,7 @@ python package_do_split_gconvs () {
raise bb.build.FuncFailed("localedef returned an error")
def output_locale(name, locale, encoding):
- pkgname = 'locale-base-' + legitimize_package_name(name)
+ pkgname = bb.data.getVar('MLPREFIX', d) + 'locale-base-' + legitimize_package_name(name)
bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
rprovides = ' virtual-locale-%s' % legitimize_package_name(name)
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 26/29] oprofileui: remove dependence on gnome-vfs
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (24 preceding siblings ...)
2011-09-28 7:06 ` [CONSOLIDATED PULL 25/29] libc-package.bbclass: add MLPREFIX when set values to PACKAGES Saul Wold
@ 2011-09-28 7:06 ` Saul Wold
2011-09-28 7:06 ` [CONSOLIDATED PULL 27/29] libgsf: " Saul Wold
` (3 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:06 UTC (permalink / raw)
To: openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
meta/recipes-kernel/oprofile/oprofileui.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/oprofile/oprofileui.inc b/meta/recipes-kernel/oprofile/oprofileui.inc
index 5170357..ab14c38 100644
--- a/meta/recipes-kernel/oprofile/oprofileui.inc
+++ b/meta/recipes-kernel/oprofile/oprofileui.inc
@@ -8,7 +8,7 @@ SECTION = "x11"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "glib-2.0 gtk+ libglade gnome-vfs libxml2 avahi-ui gconf"
+DEPENDS = "glib-2.0 gtk+ libglade libxml2 avahi-ui gconf"
inherit autotools pkgconfig gtk-icon-cache
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 27/29] libgsf: remove dependence on gnome-vfs
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (25 preceding siblings ...)
2011-09-28 7:06 ` [CONSOLIDATED PULL 26/29] oprofileui: remove dependence on gnome-vfs Saul Wold
@ 2011-09-28 7:06 ` Saul Wold
2011-09-28 7:06 ` [CONSOLIDATED PULL 28/29] tables: remove it as obsolete recipe Saul Wold
` (2 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:06 UTC (permalink / raw)
To: openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../recipes-gnome/libgsf/libgsf_1.14.5.bb | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb b/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
index 3ac7d6e..bf1b1ad 100644
--- a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
+++ b/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
@@ -1,10 +1,14 @@
DESCRIPTION = "GNOME Structured File Library"
LICENSE = "GPL"
SECTION = "libs"
-PR = "r1"
+PR = "r2"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \
+ file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63 \
+ file://gsf/gsf.h;endline=25;md5=15cf6d31ad023167779ab5f0bbb76f49"
DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
-RDEPENDS_${PN} = "gconf gnome-vfs"
+RDEPENDS_${PN} = "gconf"
PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 28/29] tables: remove it as obsolete recipe
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (26 preceding siblings ...)
2011-09-28 7:06 ` [CONSOLIDATED PULL 27/29] libgsf: " Saul Wold
@ 2011-09-28 7:06 ` Saul Wold
2011-09-28 7:06 ` [CONSOLIDATED PULL 29/29] gnome-vfs: remove it as obsolete recipe in favor of GIO/GVFS Saul Wold
2011-09-28 10:54 ` [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Richard Purdie
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:06 UTC (permalink / raw)
To: openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
tables depends on obsolete gnome-vfs, and is not maintained in clutter git repo
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
meta-demoapps/recipes-graphics/clutter/table.inc | 13 -------------
.../recipes-graphics/clutter/table/fixes.patch | 16 ----------------
.../recipes-graphics/clutter/table_git.bb | 15 ---------------
3 files changed, 0 insertions(+), 44 deletions(-)
delete mode 100644 meta-demoapps/recipes-graphics/clutter/table.inc
delete mode 100644 meta-demoapps/recipes-graphics/clutter/table/fixes.patch
delete mode 100644 meta-demoapps/recipes-graphics/clutter/table_git.bb
diff --git a/meta-demoapps/recipes-graphics/clutter/table.inc b/meta-demoapps/recipes-graphics/clutter/table.inc
deleted file mode 100644
index 937ad56..0000000
--- a/meta-demoapps/recipes-graphics/clutter/table.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Table Clutter Demo"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPLv2.1 & GPLv2"
-
-DEPENDS = "clutter-gst-1.4 gnome-vfs"
-
-inherit autotools pkgconfig
-
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 ${S}/table ${D}${bindir}/table
-}
-
diff --git a/meta-demoapps/recipes-graphics/clutter/table/fixes.patch b/meta-demoapps/recipes-graphics/clutter/table/fixes.patch
deleted file mode 100644
index 323bf13..0000000
--- a/meta-demoapps/recipes-graphics/clutter/table/fixes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-
-Index: table/Makefile
-===================================================================
---- table.orig/Makefile 2007-07-10 13:24:18.000000000 +0100
-+++ table/Makefile 2007-07-10 13:28:10.000000000 +0100
-@@ -8,7 +8,7 @@ all: table
-
-
- table: table.o clutter-dominatrix.o clutter-video-player.o
-- $(CC) -g -Wall $(CFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
-+ $(CC) -g -Wall $(CFLAGS) $(LDFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
-
- clean:
- rm -fr *.o table
-\ No newline at end of file
diff --git a/meta-demoapps/recipes-graphics/clutter/table_git.bb b/meta-demoapps/recipes-graphics/clutter/table_git.bb
deleted file mode 100644
index d0ae184..0000000
--- a/meta-demoapps/recipes-graphics/clutter/table_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require table.inc
-
-LIC_FILES_CHKSUM = "file://fluttr/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
- file://script-viewer/COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-SRCREV = "4b267533ce16656cba4104fc39dc12709c1bdddf"
-PV = "0.3.0+git${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://git.clutter-project.org/toys.git;protocol=git \
- file://fixes.patch;patch=1"
-
-S = "${WORKDIR}/git/table"
-
-
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [CONSOLIDATED PULL 29/29] gnome-vfs: remove it as obsolete recipe in favor of GIO/GVFS
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (27 preceding siblings ...)
2011-09-28 7:06 ` [CONSOLIDATED PULL 28/29] tables: remove it as obsolete recipe Saul Wold
@ 2011-09-28 7:06 ` Saul Wold
2011-09-28 10:54 ` [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Richard Purdie
29 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-09-28 7:06 UTC (permalink / raw)
To: openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 11 ----
meta/conf/multilib.conf | 1 -
.../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch | 13 -----
.../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch | 53 --------------------
meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb | 50 ------------------
5 files changed, 0 insertions(+), 128 deletions(-)
delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
delete mode 100644 meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 47fa7bf..9e548bf 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -4612,17 +4612,6 @@ RECIPE_COMMENTS_pn-libx11-trim = ""
RECIPE_LAST_UPDATE_pn-libx11-trim = "Jul 9, 2010"
RECIPE_MAINTAINER_pn-libx11-trim = "Dexuan Cui <dexuan.cui@intel.com>"
-RECIPE_STATUS_pn-gnome-vfs = "green"
-RECIPE_DEPENDENCY_CHECK_pn-gnome-vfs = "not done"
-RECIPE_LATEST_VERSION_pn-gnome-vfs = "2.24.4"
-RECIPE_NO_OF_PATCHES_pn-gnome-vfs = "2"
-RECIPE_INTEL_SECTION_pn-gnome-vfs = "gnome/lib"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gnome-vfs = "6 months"
-RECIPE_LATEST_RELEASE_DATE_pn-gnome-vfs = "Sep 28, 2010"
-RECIPE_COMMENTS_pn-gnome-vfs = ""
-RECIPE_LAST_UPDATE_pn-gnome-vfs = "Nov 24, 2010"
-RECIPE_MAINTAINER_pn-gnome-vfs = "Dexuan Cui <dexuan.cui@intel.com>"
-
RECIPE_STATUS_pn-xcb-util = "green"
RECIPE_DEPENDENCY_CHECK_pn-xcb-util = "not done"
RECIPE_LATEST_VERSION_pn-xcb-util = "0.3.8"
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index b9da33a..f14da72 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -118,7 +118,6 @@ BBCLASSEXTEND_append_pn-gnome-doc-utils = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-gnome-keyring = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-gnome-mime-data = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-gnome-mime-data = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-gnome-vfs = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-gnutls = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-grep = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-groff = " ${MULTILIBS}"
diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
deleted file mode 100644
index 0f52136..0000000
--- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000
-+++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100
-@@ -154,7 +154,7 @@
- AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-
- if test x"$GCONFTOOL" = xno; then
-- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-+ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf])
- fi
-
- AM_GCONF_SOURCE_2
diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
deleted file mode 100644
index dabec32..0000000
--- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-removes kerberos completely to avoid conflicts with installed kerberos
---- configure.in.orig 2007-01-05 19:42:26.418541610 +0200
-+++ configure.in 2007-01-05 19:42:56.604261797 +0200
-@@ -436,47 +436,6 @@
- ])
- AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
- AC_SUBST(CDDA_LIBS)
--
--dnl GSSAPI
--dnl Check for Kerberos installation
--have_gssapi=no
--AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
--
--if test "x$KRB5_CONFIG" != "xnone"; then
-- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
-- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
--
-- saved_CPPFLAGS="$CPPFLAGS"
-- saved_LIBS="$LIBS"
-- LIBS="$LIBS $GSSAPI_LIBS"
-- CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
-- # MIT and Heimdal put gssapi.h in different places
-- AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
-- AC_CHECK_FUNCS(gss_init_sec_context, [
-- AC_MSG_NOTICE([GSSAPI authentication support enabled])
-- AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
-- AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
-- have_gssapi=yes
--
-- # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
-- AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
-- [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name,
-- [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
-- ], [
-- #ifdef HAVE_GSSAPI_GSSAPI_H
-- #include <gssapi/gssapi.h>
-- #else
-- #include <gssapi.h>
-- #endif
-- ])
-- ])
-- break
-- ])
-- LIBS="$saved_LIBS"
-- CPPFLAGS="$saved_CPPFLAGS"
--fi
--AC_SUBST(GSSAPI_LIBS)
--AC_SUBST(GSSAPI_CFLAGS)
-
- dnl ******************************
- dnl http-method (neon checks)
diff --git a/meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb b/meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb
deleted file mode 100644
index c09c8be..0000000
--- a/meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "a userspace virtual filesystem"
-HOMEPAGE = "http://www.gnome.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "GPLv2+ & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://libgnomevfs/gnome-vfs.h;endline=25;md5=17071e69707a8f42887d88413f2623cb \
- file://programs/gnomevfs-ls.c;endline=23;md5=678a2e8bedaef5818ccabe633840196b \
- file://daemon/vfs-daemon.c;endline=21;md5=5f2c61553fb16abb07fc9498ca03fe1f \
- file://modules/cdda-cddb.h;endline=22;md5=20ed324ca64907c366ecd7f22b8e0c54"
-
-DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib"
-RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
-# Some legacy packages will require gnome-mime-data to be installed, but use of
-# it is deprecated.
-PR = "r0"
-
-inherit gnome
-
-# This is to provide compatibility with the gnome-vfs DBus fork
-RPROVIDES = "gnome-vfs-plugin-dbus"
-
-SRC_URI += "file://gconftool-lossage.patch \
- file://gnome-vfs-no-kerberos.patch;striplevel=0"
-
-SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e"
-SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa"
-
-EXTRA_OECONF = " --disable-hal \
- --disable-openssl \
- --disable-samba \
- ac_cv_lib_acl_acl_get_file=no \
- ac_cv_lib_sec_acl=no \
- gvfs_cv_HAVE_SOLARIS_ACLS=no \
- gvfs_cv_HAVE_POSIX_ACLS=no \
- "
-
-FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services"
-FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug"
-FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
-FILES_${PN}-doc += " ${datadir}/gtk-doc"
-
-PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
-
-python populate_packages_prepend () {
- print bb.data.getVar('FILES_gnome-vfs', d, 1)
-
- plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
- do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
-}
--
1.7.6
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
` (28 preceding siblings ...)
2011-09-28 7:06 ` [CONSOLIDATED PULL 29/29] gnome-vfs: remove it as obsolete recipe in favor of GIO/GVFS Saul Wold
@ 2011-09-28 10:54 ` Richard Purdie
29 siblings, 0 replies; 31+ messages in thread
From: Richard Purdie @ 2011-09-28 10:54 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hi Saul,
On Wed, 2011-09-28 at 00:05 -0700, Saul Wold wrote:
> I have reviewed most of these changes, and the current autobuilder built
> all the changes except the last batch multilib changes since we don't have
> that setup.
>
> Please review the multi-lib change.
>
> There was an issue with the Autobuilder, Mips and Eglibc that I need to
> investgate further with Khem, but based on the inital build I think we can
> pull it now and fix it shortly.
>
> I think that Josh's ghostscript, Bruce's kernel update and my rpm patches
> are suited to be pulled into RC4, other isolated changes are the oprofileui
> removal of gnome-vfs and Koen's avahi fix.
>
> Please review and pull as approriate.
>
> Sau!
I merged these:
> Bruce Ashfield (1):
> linux-yocto/meta: eg20t and live boot config changes
>
> Dongxiao Xu (4):
> multilib.bbclass: map RDEPENDS and LINGUAS_INSTALL for image recipes
> multilib: remove the multilib handling to allarch
> package_rpm: combine normal and multilib solution manifest together
> libc-package.bbclass: add MLPREFIX when set values to PACKAGES
>
> Joshua Lock (1):
> ghostscript: disable check for time.h
>
> Khem Raj (2):
> gcc-4.6: Use --with-linker-hash-style configure option
> eglibc: Add recipes for 2.14
>
> Koen Kooi (1):
> avahi: fix avahi-systemd dependencies
>
> Richard Purdie (4):
> gcc: Fix two QA issues
> grub: Fix insane/QA architecture warning
> sqlite3: Fix nativesdk packaging/QA warnings
> pseudo: Fix QA warnings
>
> Saul Wold (4):
> rpm: ensure that magic file is relocatable
> zypper & sat-solver: needs RDEPENDS on rpm-lib
> rpm: fix QA Warning on installed but not shipped staticdev filesw
> distro_tracking: Update Manual Upgrade Checks
>
> Simon Busch (2):
> meta: qt4: fix postprocessing of pkg-config files
> qt4-embedded: move qte.sh profile script into own package
>
> Tom Zanussi (2):
> sysprof: update to version 1.1.8
> blktrace: update to version 1.0.3
>
> Zhai Edwin (3):
> oprofileui: remove dependence on gnome-vfs
> libgsf: remove dependence on gnome-vfs
> tables: remove it as obsolete recipe
I didn't take this as I think we may need to give meta-oe the
opportunity to take this in, then we'll drop it:
>Zhai Edwin (1):
> gnome-vfs: remove it as obsolete recipe in favor of GIO/GVFS
I took this but changed the patch as I requested on the mailing list:
>Khem Raj (1):
> conf,recipes: Add new variable LINKER_HASH_STYLE
I didn't take this since I worry this is where your mips compiler issues
were coming from. If we could reset master on mips, we can figure out if
thats the case. I'm not adversed to the patch, I just think we need to
be careful and figure out if there are regressions coming in through it:
>Khem Raj (1):
> gcc-4.6: Update to tip of FSF gcc-4_6-branch
These I'm holding pending test reports back from Dongxiao. I merged four
of the multilib patches:
>Dongxiao Xu (6):
> multilib: add MLPREFIX to deploy folder
> tune-i586: fix hardcoded TUNE_PKGARCH
Cheers,
Richard
^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2011-09-28 11:00 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-28 7:05 [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 01/29] sysprof: update to version 1.1.8 Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 02/29] blktrace: update to version 1.0.3 Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 03/29] avahi: fix avahi-systemd dependencies Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 04/29] linux-yocto/meta: eg20t and live boot config changes Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 05/29] gcc: Fix two QA issues Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 06/29] grub: Fix insane/QA architecture warning Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 07/29] sqlite3: Fix nativesdk packaging/QA warnings Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 08/29] pseudo: Fix QA warnings Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 09/29] meta: qt4: fix postprocessing of pkg-config files Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 10/29] qt4-embedded: move qte.sh profile script into own package Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 11/29] conf, recipes: Add new variable LINKER_HASH_STYLE Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 12/29] gcc-4.6: Use --with-linker-hash-style configure option Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 13/29] eglibc: Add recipes for 2.14 Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 14/29] gcc-4.6: Update to tip of FSF gcc-4_6-branch Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 15/29] rpm: ensure that magic file is relocatable Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 16/29] zypper & sat-solver: needs RDEPENDS on rpm-lib Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 17/29] rpm: fix QA Warning on installed but not shipped staticdev filesw Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 18/29] ghostscript: disable check for time.h Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 19/29] distro_tracking: Update Manual Upgrade Checks Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 20/29] multilib.bbclass: map RDEPENDS and LINGUAS_INSTALL for image recipes Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 21/29] multilib: remove the multilib handling to allarch Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 22/29] multilib: add MLPREFIX to deploy folder Saul Wold
2011-09-28 7:05 ` [CONSOLIDATED PULL 23/29] tune-i586: fix hardcoded TUNE_PKGARCH Saul Wold
2011-09-28 7:06 ` [CONSOLIDATED PULL 24/29] package_rpm: combine normal and multilib solution manifest together Saul Wold
2011-09-28 7:06 ` [CONSOLIDATED PULL 25/29] libc-package.bbclass: add MLPREFIX when set values to PACKAGES Saul Wold
2011-09-28 7:06 ` [CONSOLIDATED PULL 26/29] oprofileui: remove dependence on gnome-vfs Saul Wold
2011-09-28 7:06 ` [CONSOLIDATED PULL 27/29] libgsf: " Saul Wold
2011-09-28 7:06 ` [CONSOLIDATED PULL 28/29] tables: remove it as obsolete recipe Saul Wold
2011-09-28 7:06 ` [CONSOLIDATED PULL 29/29] gnome-vfs: remove it as obsolete recipe in favor of GIO/GVFS Saul Wold
2011-09-28 10:54 ` [CONSOLIDATED PULL 00/29] Picking up patches from OE-Core list Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox