Skip to contentSkip to conversation

Picking up patches from OE-Core list

GIT PULL Saul Wold 2 participants 31 messages Sep 28, 2011 Arm/actions semi architecture

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

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
Signature · 1 line
1.7.6
author
#1 lore raw

[CONSOLIDATED PULL 01/29] sysprof: update to version 1.1.8

From: Tom Zanussi <[email protected]>

Also removes unused SCR_URI checksums.

---
 meta/recipes-kernel/sysprof/sysprof_git.bb |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
meta/recipes-kernel/sysprof/sysprof_git.bb +3 -6
index 1af5822..10bde04 100644
@@ -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
Signature · 1 line
1.7.6
author
#2 lore raw

[CONSOLIDATED PULL 02/29] blktrace: update to version 1.0.3

In reply to Saul Wold

From: Tom Zanussi <[email protected]>

This also removes dso_linking_change_build_fix.patch since the same change has been made upstream.

Also removes unused SRC_URI checksums.

---
 .../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
meta/recipes-kernel/blktrace/blktrace/dso_linking_change_build_fix.patch deleted +0 -26
deleted file mode 100644
index 5b74339..0000000
@@ -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 <[email protected]>
-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)
- 
meta/recipes-kernel/blktrace/blktrace_git.bb +4 -8
index 37b7f51..3439a1f 100644
@@ -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"
 
Signature · 1 line
1.7.6
author
#3 lore raw

[CONSOLIDATED PULL 03/29] avahi: fix avahi-systemd dependencies

In reply to Saul Wold

From: Koen Kooi <[email protected]>

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

---
 meta/recipes-connectivity/avahi/avahi.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-connectivity/avahi/avahi.inc +3 -1
index c3c9c71..5ad9db0 100644
@@ -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
Signature · 1 line
1.7.6
author
#4 lore raw

[CONSOLIDATED PULL 06/29] grub: Fix insane/QA architecture warning

In reply to Saul Wold

From: Richard Purdie <[email protected]>

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.

---
 meta/recipes-bsp/grub/grub_1.99.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-bsp/grub/grub_1.99.bb +1 -1
index b910b5a..ba41e8f 100644
@@ -41,4 +41,4 @@ do_install_append () {
 
 FILES_${PN}-doc = "${datadir}"
 FILES_${PN} = "/usr /etc"
-
+INSANE_SKIP_${PN} = "arch"
Signature · 1 line
1.7.6
author
#5 lore raw

[CONSOLIDATED PULL 05/29] gcc: Fix two QA issues

In reply to Saul Wold

From: Richard Purdie <[email protected]>

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.

---
 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(-)
meta/recipes-devtools/gcc/gcc-package-sdk.inc +4 -0
index 8dd4ef7..e2095e3 100644
@@ -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
meta/recipes-devtools/gcc/gcc-package-target.inc +2 -0
index a0e5da4..f0f1a04 100644
@@ -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/ \
 "
Signature · 1 line
1.7.6
author
#6 lore raw

[CONSOLIDATED PULL 04/29] linux-yocto/meta: eg20t and live boot config changes

In reply to Saul Wold

From: Bruce Ashfield <[email protected]>

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]

---
 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(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1 -1
index 2b7a4f9..0c59a5b 100644
@@ -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}"
meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
index f11c0ea..9ece25c 100644
@@ -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}"
Signature · 1 line
1.7.6
author
#7 lore raw

[CONSOLIDATED PULL 08/29] pseudo: Fix QA warnings

In reply to Saul Wold

From: Richard Purdie <[email protected]>

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

---
 meta/recipes-devtools/pseudo/pseudo.inc |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
meta/recipes-devtools/pseudo/pseudo.inc +12 -6
index 0416a53..0c7185b 100644
@@ -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
Signature · 1 line
1.7.6
author
#8 lore raw

[CONSOLIDATED PULL 07/29] sqlite3: Fix nativesdk packaging/QA warnings

In reply to Saul Wold

From: Richard Purdie <[email protected]>

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.

---
 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(-)
meta/recipes-support/sqlite/sqlite3.inc +1 -1
index 2a52a44..ece35c5 100644
@@ -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 \
meta/recipes-support/sqlite/sqlite3_3.7.7.1.bb +1 -1
index 5651c07..fd03780 100644
@@ -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"
Signature · 1 line
1.7.6
author
#9 lore raw

[CONSOLIDATED PULL 09/29] meta: qt4: fix postprocessing of pkg-config files

In reply to Saul Wold

From: Simon Busch <[email protected]>

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.

---
 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(-)
meta/recipes-qt/qt4/qt4-embedded.inc +1 -1
index 9914c61..1ede922 100644
@@ -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"
meta/recipes-qt/qt4/qt4-x11-free.inc +1 -1
index 0a714be..a360ec3 100644
@@ -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"
meta/recipes-qt/qt4/qt4.inc +1 -3
index 5545be7..7f3e1a4 100644
@@ -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
 
Signature · 1 line
1.7.6
author
#10 lore raw

[CONSOLIDATED PULL 11/29] conf, recipes: Add new variable LINKER_HASH_STYLE

In reply to Saul Wold

From: Khem Raj <[email protected]>

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

---
 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(-)
meta/conf/bitbake.conf +2 -1
index 730439c..47e8547 100644
@@ -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} \
meta/conf/distro/include/tcmode-default.inc +5 -1
index 2857215..1ddfbce 100644
@@ -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"
meta/recipes-core/uclibc/uclibc.inc +1 -1
index 222c34f..f104114 100644
@@ -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
 }
Signature · 1 line
1.7.6
author
#11 lore raw

[CONSOLIDATED PULL 10/29] qt4-embedded: move qte.sh profile script into own package

In reply to Saul Wold

From: Simon Busch <[email protected]>

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.

---
 meta/recipes-qt/qt4/qt4-embedded.inc |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
meta/recipes-qt/qt4/qt4-embedded.inc +6 -2
index 1ede922..ed872b0 100644
@@ -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
 
Signature · 1 line
1.7.6
author
#12 lore raw

[CONSOLIDATED PULL 14/29] gcc-4.6: Update to tip of FSF gcc-4_6-branch

In reply to Saul Wold

From: Khem Raj <[email protected]>

---
 meta/recipes-devtools/gcc/gcc-4.6.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/gcc/gcc-4.6.inc +3 -3
index eef0ef0..a352e36 100644
@@ -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)}"
 
Signature · 1 line
1.7.6
author
#13 lore raw

[CONSOLIDATED PULL 12/29] gcc-4.6: Use --with-linker-hash-style configure option

In reply to Saul Wold

From: Khem Raj <[email protected]>

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

---
 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
meta/recipes-devtools/gcc/gcc-4.6.inc +2 -0
index b7b6a43..eef0ef0 100644
@@ -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 \
meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch new file +196 -0

196 lines not on this page · raw message

Signature · 1 line
1.7.6
author
#14 lore raw

[CONSOLIDATED PULL 15/29] rpm: ensure that magic file is relocatable

In reply to Saul Wold

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]

---
 meta/recipes-devtools/rpm/rpm_5.4.0.bb |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
meta/recipes-devtools/rpm/rpm_5.4.0.bb +11 -3
index a7b360d..356512a 100644
@@ -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
Signature · 1 line
1.7.6
author
#15 lore raw

[CONSOLIDATED PULL 16/29] zypper & sat-solver: needs RDEPENDS on rpm-lib

In reply to Saul Wold
---
 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(-)
meta/recipes-extended/libzypp/libzypp_git.bb +4 -4
index 4b1b8e4..7d9382a 100644
@@ -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"
meta/recipes-extended/sat-solver/sat-solver_git.bb +3 -1
index 0d9a439..b616c57 100644
@@ -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 () {
meta/recipes-extended/zypper/zypper_git.bb +4 -2
index 7f7ceb3..4f4fc4d 100644
@@ -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}"
Signature · 1 line
1.7.6
author
#16 lore raw

[CONSOLIDATED PULL 13/29] eglibc: Add recipes for 2.14

In reply to Saul Wold

From: Khem Raj <[email protected]>

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

---
 .../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
meta/recipes-core/eglibc/cross-localedef-native_2.14.bb new file +44 -0
new file mode 100644
index 0000000..6f311fc
@@ -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
+}
meta/recipes-core/eglibc/eglibc-2.14/IO-acquire-lock-fix.patch new file +17 -0
new file mode 100644
index 0000000..cf58035
@@ -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)
meta/recipes-core/eglibc/eglibc-2.14/armv4-eabi-compile-fix.patch new file +25 -0
new file mode 100644
index 0000000..c2407ee
@@ -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__ */
meta/recipes-core/eglibc/eglibc-2.14/eglibc-rpc-export-again.patch new file +69 -0

69 lines not on this page · raw message

meta/recipes-core/eglibc/eglibc-2.14/eglibc-svn-arm-lowlevellock-include-tls.patch new file +21 -0
new file mode 100644
index 0000000..4313aa5
@@ -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
meta/recipes-core/eglibc/eglibc-2.14/etc/ld.so.conf new file +0 -0
new file mode 100644
index 0000000..e69de29
meta/recipes-core/eglibc/eglibc-2.14/generate-supported.mk new file +11 -0
new file mode 100644
index 0000000..d2a28c2
@@ -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
meta/recipes-core/eglibc/eglibc-2.14/ld-search-order.patch new file +56 -0

56 lines not on this page · raw message

meta/recipes-core/eglibc/eglibc-2.14/mips-rld-map-check.patch new file +26 -0
new file mode 100644
index 0000000..9b646fe
@@ -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 <[email protected]>
+
+
+---
+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)
meta/recipes-core/eglibc/eglibc-2.14/multilib_readlib.patch new file +17 -0
new file mode 100644
index 0000000..1542b1b
@@ -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[] =
meta/recipes-core/eglibc/eglibc-2.14/ppc-sqrt.patch new file +538 -0

538 lines not on this page · raw message

meta/recipes-core/eglibc/eglibc-2.14/shorten-build-commands.patch new file +82 -0

82 lines not on this page · raw message

meta/recipes-core/eglibc/eglibc-2.14/stack-protector-test.patch new file +35 -0
new file mode 100644
index 0000000..dbf70a9
@@ -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 <[email protected]>
+
+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
meta/recipes-core/eglibc/eglibc-initial_2.14.bb new file +6 -0
new file mode 100644
index 0000000..787c762
@@ -0,0 +1,6 @@
+require eglibc_${PV}.bb
+require eglibc-initial.inc
+
+do_configure_prepend () {
+        unset CFLAGS
+}
meta/recipes-core/eglibc/eglibc-locale_2.14.bb new file +1 -0
new file mode 100644
index 0000000..ce6c1d2
@@ -0,0 +1 @@
+require eglibc-locale.inc
meta/recipes-core/eglibc/eglibc_2.14.bb new file +219 -0

219 lines not on this page · raw message

Signature · 1 line
1.7.6
author
#17 lore raw

[CONSOLIDATED PULL 18/29] ghostscript: disable check for time.h

In reply to Saul Wold

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.

---
 .../ghostscript/ghostscript_9.02.bb                |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
meta/recipes-extended/ghostscript/ghostscript_9.02.bb +5 -0
index 2e46734..9b21c66 100644
@@ -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 () {
Signature · 1 line
1.7.6
author
#18 lore raw

[CONSOLIDATED PULL 17/29] rpm: fix QA Warning on installed but not shipped staticdev filesw

In reply to Saul Wold
---
 meta/recipes-devtools/rpm/rpm_5.4.0.bb |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
meta/recipes-devtools/rpm/rpm_5.4.0.bb +10 -7
index 356512a..bbef0be 100644
@@ -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
Signature · 1 line
1.7.6
author
#19 lore raw

[CONSOLIDATED PULL 21/29] multilib: remove the multilib handling to allarch

In reply to Saul Wold

From: Dongxiao Xu <[email protected]>

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]

---
 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(-)
meta/classes/multilib.bbclass +1 -1
index 0ea1038..6c0dd37 100644
@@ -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):
meta/classes/multilib_global.bbclass +1 -1
index cd22163..2da66a5 100644
@@ -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
meta/conf/multilib.conf +7 -0
index 3133bf1..b9da33a 100644
@@ -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}"
meta/recipes-devtools/python/python-pygobject_2.27.91.bb +1 -1
index 9ff2fe7..fd696a5 100644
@@ -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"
Signature · 1 line
1.7.6
author
#20 lore raw

[CONSOLIDATED PULL 20/29] multilib.bbclass: map RDEPENDS and LINGUAS_INSTALL for image recipes

In reply to Saul Wold

From: Dongxiao Xu <[email protected]>

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]

---
 meta/classes/multilib.bbclass |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
meta/classes/multilib.bbclass +4 -1
index 98f6911..0ea1038 100644
@@ -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
Signature · 1 line
1.7.6
author
#21 lore raw

[CONSOLIDATED PULL 19/29] distro_tracking: Update Manual Upgrade Checks

In reply to Saul Wold
---
 .../conf/distro/include/distro_tracking_fields.inc |   77 ++++++++++++--------
 1 files changed, 46 insertions(+), 31 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +46 -31
index c1f15e1..47fa7bf 100644
@@ -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 <[email protected]>"
 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 <[email protected]>"
 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 <[email protected]>"
-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 <[email protected]>"
 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 <[email protected]>"
 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 <[email protected]>"
-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 <[email protected]>"
 
 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 <[email protected]>"
-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 <[email protected]>"
+RECIPE_MAINTAINER_pn-adt-installer = "Jessica Zhang <[email protected]>"
+
+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"
Signature · 1 line
1.7.6
author
#22 lore raw

[CONSOLIDATED PULL 22/29] multilib: add MLPREFIX to deploy folder

In reply to Saul Wold

From: Dongxiao Xu <[email protected]>

Add MLPREFIX to multilib deploy forlder to avoid the confliction between multilib and normal package deploy directory.

---
 meta/classes/multilib.bbclass    |    5 -----
 meta/classes/package_rpm.bbclass |   10 ++++++++--
 meta/classes/rootfs_rpm.bbclass  |    2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
meta/classes/multilib.bbclass +0 -5
index 6c0dd37..1aed2a9 100644
@@ -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)
 }
meta/classes/package_rpm.bbclass +8 -2
index 775d525..45de0f8 100644
@@ -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)
meta/classes/rootfs_rpm.bbclass +1 -1
index 5ac6bca..dd370b2 100644
@@ -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))
Signature · 1 line
1.7.6
author
#23 lore raw

[CONSOLIDATED PULL 24/29] package_rpm: combine normal and multilib solution manifest together

In reply to Saul Wold

From: Dongxiao Xu <[email protected]>

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.

---
 meta/classes/package_rpm.bbclass |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
meta/classes/package_rpm.bbclass +3 -2
index 45de0f8..fa0d8c3 100644
@@ -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 () {
Signature · 1 line
1.7.6
author
#24 lore raw

[CONSOLIDATED PULL 23/29] tune-i586: fix hardcoded TUNE_PKGARCH

In reply to Saul Wold

From: Dongxiao Xu <[email protected]>

Use TUNE_FEATURES to determine the setting to TUNE_PKGARCH, which fixes the wrong setting of PACKAGE_ARCH in multilib case.

---
 meta/conf/machine/include/tune-i586.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
meta/conf/machine/include/tune-i586.inc +2 -1
index ba655b9..a40ce18 100644
@@ -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
 
Signature · 1 line
1.7.6
author
#25 lore raw

[CONSOLIDATED PULL 25/29] libc-package.bbclass: add MLPREFIX when set values to PACKAGES

In reply to Saul Wold

From: Dongxiao Xu <[email protected]>

There are some places that PACKAGES are dynamically set. To support multilib, we need to add MLPREFIX before the package name in those settings.

---
 meta/classes/libc-package.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/libc-package.bbclass +1 -1
index 9d32844..71a577b 100644
@@ -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)
Signature · 1 line
1.7.6
author
#26 lore raw

[CONSOLIDATED PULL 26/29] oprofileui: remove dependence on gnome-vfs

In reply to Saul Wold

From: Zhai Edwin <[email protected]>

---
 meta/recipes-kernel/oprofile/oprofileui.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-kernel/oprofile/oprofileui.inc +1 -1
index 5170357..ab14c38 100644
@@ -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
 
Signature · 1 line
1.7.6
author
#27 lore raw

[CONSOLIDATED PULL 28/29] tables: remove it as obsolete recipe

In reply to Saul Wold

From: Zhai Edwin <[email protected]>

tables depends on obsolete gnome-vfs, and is not maintained in clutter git repo

---
 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
meta-demoapps/recipes-graphics/clutter/table.inc deleted +0 -13
deleted file mode 100644
index 937ad56..0000000
@@ -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
-}
-
meta-demoapps/recipes-graphics/clutter/table/fixes.patch deleted +0 -16
deleted file mode 100644
index 323bf13..0000000
@@ -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
meta-demoapps/recipes-graphics/clutter/table_git.bb deleted +0 -15
deleted file mode 100644
index d0ae184..0000000
@@ -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"
-
-
Signature · 1 line
1.7.6
author
#28 lore raw

[CONSOLIDATED PULL 27/29] libgsf: remove dependence on gnome-vfs

In reply to Saul Wold

From: Zhai Edwin <[email protected]>

---
 .../recipes-gnome/libgsf/libgsf_1.14.5.bb          |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb +6 -2
index 3ac7d6e..bf1b1ad 100644
@@ -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 "
Signature · 1 line
1.7.6
author
#29 lore raw

[CONSOLIDATED PULL 29/29] gnome-vfs: remove it as obsolete recipe in favor of GIO/GVFS

In reply to Saul Wold

From: Zhai Edwin <[email protected]>

---
 .../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
meta/conf/distro/include/distro_tracking_fields.inc +0 -11
index 47fa7bf..9e548bf 100644
@@ -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 <[email protected]>"
 
-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 <[email protected]>"
-
 RECIPE_STATUS_pn-xcb-util = "green"
 RECIPE_DEPENDENCY_CHECK_pn-xcb-util = "not done"
 RECIPE_LATEST_VERSION_pn-xcb-util = "0.3.8"
meta/conf/multilib.conf +0 -1
index b9da33a..f14da72 100644
@@ -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}"
meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch deleted +0 -13
deleted file mode 100644
index 0f52136..0000000
@@ -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
meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch deleted +0 -53

53 lines not on this page · raw message

meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb deleted +0 -50

50 lines not on this page · raw message

Signature · 1 line
1.7.6
#30 lore raw
In reply to Saul Wold

Hi Saul,

Quoted 10 lines · Saul Wold

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.

Quoted 7 lines

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:

Quoted 35 lines

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

Quoted 8 lines

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:

Quoted 2 lines

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:

Quoted 2 lines

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:

Quoted 2 lines

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:

Quoted 3 lines

Dongxiao Xu (6):
multilib: add MLPREFIX to deploy folder
tune-i586: fix hardcoded TUNE_PKGARCH

Cheers,

Richard