Re: [OE-core] [PATCH 1/2] tcf-agent: upgrade to the latest stable revision 0.0+svnr1855
Saul Wold wrote on 2011-07-22: There seems to be a compile issue with this patch. For an X86 Build fatal error: uuid/uuid.h: No such file or directory | compilation Hi Saul, Sorry! We didn't do enough test... Lianhao and I have got the causes of the failures. This uuid.h issue is due to the lackness of util-linux in DEPENDS -- the new tcf-agent code introduces the dependency. And then for an ARM build: services/dwarfframe.c | In file included from framework/cpudefs.c:33:0: | ././machine/cpudefs-ext.h:23:26: fatal error: cpudefs-mdep.h: No | such file or directory | compilation terminated. | make: *** The new tcf-agent code by default enables some services we don't actually need, and the they cause the ARM build failure. We added the following to fix the issue: +CFLAGS += -DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ +-DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ +-DSERVICE_StackTrace=0 -DSERVICE_Symbols=0 -DSERVICE_LineNumbers=0 \ +-DSERVICE_Expressions=0 Below is the new commit(in the same branch dcui/tcf-agent) http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/tcf-agentid=ba36534bfc048d7bd2b15dc55ba253cc98c3e037 Currently Lianhao and I are doing more testing and will report back asap. Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 00/16] July 22, 2011
Richard, This contains more uclibc updates from Khem along with Bruce's 3.0 Updates. There are a couple of small updates for .gitignore and other recipes. Thanks Sau! The following changes since commit f175e4f28aa835abef8c3d5e2065054416692418: libiconv: Fix build failure on 1.13.1 (2011-07-21 22:50:06 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage Bruce Ashfield (4): linux-yocto: kernel-3.0 support recipe kernel: copy defconfig to {B} vs {S} linux-yocto: update LICENSE to GPLv2 kern-tools: update SRCREV Khem Raj (6): mesa-xlib, mesa-dri: Probe for newlocale() before using it. task-core-tools.bb: Exclude lttng-ust for x86_64/uclibc uclibc: Add patch header for sync_file_range2.patch strace: Define own sigmask macro if not defined already in signal.h util-linux: Replace sigsetmask with posix compliant functions tclibc-uclibc: Fix TARGET_OS for powerpc Kumar Gala (1): .gitignore: Update build ignores to have wildcard Mei Lei (1): dhcp: Fix libdir issue for multilib Nitin A Kamble (3): glib-2.0: fix a compilation issue due to dtrace python: fix security vulnerability fix Upstream-Status line for few patches Saul Wold (1): default-versions: Update pulseaudio as arm no longer needs a seperate backport .gitignore | 12 +- meta/classes/kernel-yocto.bbclass |6 - meta/classes/kernel.bbclass|4 +- meta/conf/distro/include/default-versions.inc |4 +- meta/conf/distro/include/tclibc-uclibc.inc |2 +- .../dhcp/dhcp-4.2.0/fix-external-bind.patch| 14 +- meta/recipes-connectivity/dhcp/dhcp4.inc |2 +- meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb |2 +- meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb |3 +- meta/recipes-core/tasks/task-core-tools.bb | 11 +- .../uclibc/uclibc-0.9.32/sync_file_range2.patch|7 + .../util-linux-2.19.1/remove_sigsetmark.patch | 35 meta/recipes-core/util-linux/util-linux_2.19.1.bb |3 +- .../btrfs-tools/btrfs-tools/fix_use_of_gcc.patch |2 +- .../dosfstools/dosfstools-2.10-kernel-2.6.patch|2 +- .../elfutils/elfutils/fix_for_gcc-4.7.patch|2 +- meta/recipes-devtools/python/python.inc|2 +- .../python/python/security_issue_2254_fix.patch| 184 meta/recipes-devtools/python/python_2.6.6.bb |1 + .../strace/strace-4.5.20/sigmask.patch | 22 +++ meta/recipes-devtools/strace/strace_4.5.20.bb |6 +- meta/recipes-graphics/mesa/mesa-dri/uclibc.patch | 40 + meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb |6 +- meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb |5 +- .../kern-tools/kern-tools-native_git.bb|2 +- meta/recipes-kernel/linux/linux-yocto.inc |2 +- meta/recipes-kernel/linux/linux-yocto_3.0.bb | 47 + 27 files changed, 387 insertions(+), 41 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch create mode 100644 meta/recipes-devtools/python/python/security_issue_2254_fix.patch create mode 100644 meta/recipes-devtools/strace/strace-4.5.20/sigmask.patch create mode 100644 meta/recipes-graphics/mesa/mesa-dri/uclibc.patch create mode 100644 meta/recipes-kernel/linux/linux-yocto_3.0.bb -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 01/16] dhcp: Fix libdir issue for multilib
From: Mei Lei lei@intel.com Signed-off-by: Mei Lei lei@intel.com --- .../dhcp/dhcp-4.2.0/fix-external-bind.patch| 14 +++--- meta/recipes-connectivity/dhcp/dhcp4.inc |2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch index f03936d..4f11655 100644 --- a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch +++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch @@ -28,7 +28,7 @@ index 77ed055..5a77f2d 100644 scripts/solaris scripts/openwrt dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a -+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a ++ $(libbind)/libdns.a $(libbind)/libisc.a man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) @@ -53,7 +53,7 @@ index 61049be..85aefa3 100644 omshell_SOURCES = omshell.c omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a -+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a ++ $(libbind)/libdns.a $(libbind)/libisc.a libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c @@ -61,7 +61,7 @@ index 61049be..85aefa3 100644 cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a \ No newline at end of file -+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a ++ $(libbind)/libdns.a $(libbind)/libisc.a diff --git a/omapip/Makefile.am b/omapip/Makefile.am index 595950a..17f2233 100644 --- a/omapip/Makefile.am @@ -71,7 +71,7 @@ index 595950a..17f2233 100644 svtest_SOURCES = test.c -svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a -+svtest_LDADD = libomapi.a $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a ++svtest_LDADD = libomapi.a $(libbind)/libdns.a $(libbind)/libisc.a diff --git a/relay/Makefile.am b/relay/Makefile.am index d8757ca..a7885da 100644 @@ -82,7 +82,7 @@ index d8757ca..a7885da 100644 dhcrelay_SOURCES = dhcrelay.c dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a -+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a ++ $(libbind)/libdns.a $(libbind)/libisc.a man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) @@ -96,8 +96,8 @@ index cdfaf47..d2c254b 100644 dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \ -../bind/lib/libisc.a -+../dhcpctl/libdhcpctl.a $(libbind)/lib/libdns.a \ -+$(libbind)/lib/libisc.a ++../dhcpctl/libdhcpctl.a $(libbind)/libdns.a \ ++$(libbind)/libisc.a man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 EXTRA_DIST = $(man_MANS) diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc index 885cc19..bdaa5e9 100644 --- a/meta/recipes-connectivity/dhcp/dhcp4.inc +++ b/meta/recipes-connectivity/dhcp/dhcp4.inc @@ -25,7 +25,7 @@ EXTRA_OECONF = --with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \ --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \ --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \ --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \ ---with-libbind=${STAGING_LIBDIR}/.. \ +--with-libbind=${STAGING_LIBDIR}/ \ do_compile_prepend () { -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 03/16] kernel: copy defconfig to {B} vs {S}
From: Bruce Ashfield bruce.ashfi...@windriver.com For kernel's that use a split source/object build the copy of defconfig to {S} in the base kernel class is problematic. The previous solution for this was to override the do_configure of the base kernel class in a subclass. While this is still a viable/valid option, it does mean that changes to the base do_configure will be missed. The solution to this is to copy a defconfig to {B} which is typically the same as {S}, so most kernel recipes won't see or care about this change. With this change in place, linux-yocto.bbclass can drop its override of do_configure. Tested with linux-yocto and oe linux recipes. Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel-yocto.bbclass |6 -- meta/classes/kernel.bbclass |4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 98272fc..a374df1 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -118,12 +118,6 @@ python do_kernel_configcheck() { bb.plain( %s % result ) } -# overrides the base kernel_do_configure, since we don't want all the -# defconfig processing in there -kernel_do_configure() { -yes '' | oe_runmake oldconfig -} - # Ensure that the branches (BSP and meta) are on the locatios specified by # their SRCREV values. If they are NOT on the right commits, the branches diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 2e36e86..9c492a3 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -181,8 +181,8 @@ sysroot_stage_all_append() { kernel_do_configure() { # Copy defconfig to .config if .config does not exist. This allows # recipes to manage the .config themselves in do_configure_prepend(). - if [ -f ${WORKDIR}/defconfig ] [ ! -f ${S}/.config ]; then - cp ${WORKDIR}/defconfig ${S}/.config + if [ -f ${WORKDIR}/defconfig ] [ ! -f ${B}/.config ]; then + cp ${WORKDIR}/defconfig ${B}/.config fi yes '' | oe_runmake oldconfig -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 04/16] linux-yocto: update LICENSE to GPLv2
From: Bruce Ashfield bruce.ashfi...@windriver.com As reported by Koen Kooi, the LICENSE for linux-yocto can be tightened up to specifiy the particular version of the GPL. cc: Koen Kooi k...@dominion.thruhere.net Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index c304d00..595795b 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -1,6 +1,6 @@ DESCRIPTION = Yocto Kernel SECTION = kernel -LICENSE = GPL +LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7 -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 05/16] kern-tools: update SRCREV
From: Bruce Ashfield bruce.ashfi...@windriver.com Fixes [YOCTO #1261] Updating the SRCREV to pickup some branch creation fixes that were causing an invalid branch name to be used on a repository that couldn't support it (i.e. standard/base on a 2.6.34). With this the 2.6.34 and 3.0 -rt branches will build. Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- .../kern-tools/kern-tools-native_git.bb|2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index f7600ca..1fbb1f7 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8 DEPENDS = git-native guilt-native -SRCREV = f8eb067b023d590b6cd8deddf6f96d6a820997af +SRCREV = f5a915c277a37ba5949b4c0778356189e7dd9ec0 PR = r10 PV = 0.1+git${SRCPV} -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 09/16] uclibc: Add patch header for sync_file_range2.patch
From: Khem Raj raj.k...@gmail.com Signed-off-by: Khem Raj raj.k...@gmail.com --- .../uclibc/uclibc-0.9.32/sync_file_range2.patch|7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/sync_file_range2.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/sync_file_range2.patch index b5e972e..4b85a43 100644 --- a/meta/recipes-core/uclibc/uclibc-0.9.32/sync_file_range2.patch +++ b/meta/recipes-core/uclibc/uclibc-0.9.32/sync_file_range2.patch @@ -1,3 +1,10 @@ +Some architectures like ppc, arm use aligned 64 bit inputs so a register is not wasted +this then uses __NR_sync_file_range2 syscall. Implement is + +Singed-off-by: Khem Raj raj.k...@gmail.com + +Upstream-Status: Pending + Index: git/libc/sysdeps/linux/common/sync_file_range.c === --- git.orig/libc/sysdeps/linux/common/sync_file_range.c 2011-07-19 14:23:35.0 -0700 -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 12/16] .gitignore: Update build ignores to have wildcard
From: Kumar Gala ga...@kernel.crashing.org ignore not just build/* but any build*/* cases. Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- .gitignore | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b13086d..d44e729 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,11 @@ *.pyc *.pyo -build/conf/local.conf -build/conf/bblayers.conf -build/downloads -build/tmp/ -build/sstate-cache -build/pyshtables.py +build*/conf/local.conf +build*/conf/bblayers.conf +build*/downloads +build*/tmp/ +build*/sstate-cache +build*/pyshtables.py pstage/ scripts/oe-git-proxy-socks sources/ -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 13/16] tclibc-uclibc: Fix TARGET_OS for powerpc
From: Khem Raj raj.k...@gmail.com 1a9ae8ea8c0540d41b8ff4d95c0420d6df754634 removed -uclibc hence it got all wrong for powerpc. uclibc TARGET_OS for classic ppc is linux-uclibc and for ppc w/ SPE its linux-uclibcspe Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/conf/distro/include/tclibc-uclibc.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc index 2ccda5b..7c06654 100644 --- a/meta/conf/distro/include/tclibc-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -5,7 +5,7 @@ TARGET_OS = linux-uclibc TARGET_OS_arm = linux-uclibceabi TARGET_OS_armeb = linux-uclibceabi -TARGET_OS_powerpc = linux${@['','-gnuspe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]} +TARGET_OS_powerpc = linux-uclibc${@['','spe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]} # Add uclibc overrides to the overrides. OVERRIDES =. libc-uclibc: -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 16/16] fix Upstream-Status line for few patches
From: Nitin A Kamble nitin.a.kam...@intel.com Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com --- .../btrfs-tools/btrfs-tools/fix_use_of_gcc.patch |2 +- .../dosfstools/dosfstools-2.10-kernel-2.6.patch|2 +- .../elfutils/elfutils/fix_for_gcc-4.7.patch|2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_use_of_gcc.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_use_of_gcc.patch index 0a5fb34..2d5315f 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_use_of_gcc.patch +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_use_of_gcc.patch @@ -1,5 +1,5 @@ Nitin A Kamble nitin.a.kam...@intel.com 2011/06/09 -UpstreamStatus: Pending +Upstream-Status: Pending Avoid these kinds of errors while doing cross build: diff --git a/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch b/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch index 3ecafc3..0c9230f 100644 --- a/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch +++ b/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch @@ -2,7 +2,7 @@ Submitted By: Jim Gifford (jim at linuxfromscratch dot org) Date: 2004-02-09 Initial Package Version: 2.6 Origin: Jim Gifford -Upstream Status: Accepted +Upstream-Status: Accepted Description: Fixes Compile Issues with the 2.6 Kernel --- dosfstools-2.10/dosfsck/common.h.orig 2004-02-09 18:37:59.056737458 + diff --git a/meta/recipes-devtools/elfutils/elfutils/fix_for_gcc-4.7.patch b/meta/recipes-devtools/elfutils/elfutils/fix_for_gcc-4.7.patch index bd22eef..bd634b4 100644 --- a/meta/recipes-devtools/elfutils/elfutils/fix_for_gcc-4.7.patch +++ b/meta/recipes-devtools/elfutils/elfutils/fix_for_gcc-4.7.patch @@ -1,4 +1,4 @@ -UpstreamStatus: pending +Upstream-Status: pending gcc 4.7 does not like pointer conversion, so have a void * tmp var to work around following compilation issue. -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 15/16] python: fix security vulnerability
From: Nitin A Kamble nitin.a.kam...@intel.com This Fixes bug: [Yocto #1254] http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-1015 Issue #2254: Fix CGIHTTPServer information disclosure. Relative paths are now collapsed within the url properly before looking in cgi_directories. Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com --- meta/recipes-devtools/python/python.inc|2 +- .../python/python/security_issue_2254_fix.patch| 184 meta/recipes-devtools/python/python_2.6.6.bb |1 + 3 files changed, 186 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/python/python/security_issue_2254_fix.patch diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc index 25a458e..a6cc917 100644 --- a/meta/recipes-devtools/python/python.inc +++ b/meta/recipes-devtools/python/python.inc @@ -3,7 +3,7 @@ HOMEPAGE = http://www.python.org; LICENSE = PSF SECTION = devel/python # bump this on every change in contrib/python/generate-manifest-2.6.py -INC_PR = nk2 +INC_PR = r2 DEFAULT_PREFERENCE = -26 diff --git a/meta/recipes-devtools/python/python/security_issue_2254_fix.patch b/meta/recipes-devtools/python/python/security_issue_2254_fix.patch new file mode 100644 index 000..f032858 --- /dev/null +++ b/meta/recipes-devtools/python/python/security_issue_2254_fix.patch @@ -0,0 +1,184 @@ +Upstream-Status: Backport +http://svn.python.org/view?view=revisionrevision=71303 + +Issue #2254: Fix CGIHTTPServer information disclosure. Relative paths are + now collapsed within the url properly before looking in cgi_directories. +Signed-Off-By: Nitin A Kamble nitin.a.kam...@intel.com +2011/07/19 + +Index: Python-2.6.6/Lib/CGIHTTPServer.py +=== +--- Python-2.6.6.orig/Lib/CGIHTTPServer.py Python-2.6.6/Lib/CGIHTTPServer.py +@@ -70,27 +70,20 @@ class CGIHTTPRequestHandler(SimpleHTTPSe + return SimpleHTTPServer.SimpleHTTPRequestHandler.send_head(self) + + def is_cgi(self): +-Test whether self.path corresponds to a CGI script, +-and return a boolean. ++Test whether self.path corresponds to a CGI script. + +-This function sets self.cgi_info to a tuple (dir, rest) +-when it returns True, where dir is the directory part before +-the CGI script name. Note that rest begins with a +-slash if it is not empty. +- +-The default implementation tests whether the path +-begins with one of the strings in the list +-self.cgi_directories (and the next character is a '/' +-or the end of the string). ++Returns True and updates the cgi_info attribute to the tuple ++(dir, rest) if self.path requires running a CGI script. ++Returns False otherwise. ++ ++The default implementation tests whether the normalized url ++path begins with one of the strings in self.cgi_directories ++(and the next character is a '/' or the end of the string). + +- +-path = self.path +- +-for x in self.cgi_directories: +-i = len(x) +-if path[:i] == x and (not path[i:] or path[i] == '/'): +-self.cgi_info = path[:i], path[i+1:] +-return True ++splitpath = _url_collapse_path_split(self.path) ++if splitpath[0] in self.cgi_directories: ++self.cgi_info = splitpath ++return True + return False + + cgi_directories = ['/cgi-bin', '/htbin'] +@@ -299,6 +292,46 @@ class CGIHTTPRequestHandler(SimpleHTTPSe + self.log_message(CGI script exited OK) + + ++# TODO(gregory.p.smith): Move this into an appropriate library. ++def _url_collapse_path_split(path): ++ ++Given a URL path, remove extra '/'s and '.' path elements and collapse ++any '..' references. ++ ++Implements something akin to RFC-2396 5.2 step 6 to parse relative paths. ++ ++Returns: A tuple of (head, tail) where tail is everything after the final / ++and head is everything before it. Head will always start with a '/' and, ++if it contains anything else, never have a trailing '/'. ++ ++Raises: IndexError if too many '..' occur within the path. ++ ++# Similar to os.path.split(os.path.normpath(path)) but specific to URL ++# path semantics rather than local operating system semantics. ++path_parts = [] ++for part in path.split('/'): ++if part == '.': ++path_parts.append('') ++else: ++path_parts.append(part) ++# Filter out blank non trailing parts before consuming the '..'. ++path_parts = [part for part in path_parts[:-1] if part] + path_parts[-1:] ++if path_parts: ++tail_part = path_parts.pop() ++else: ++tail_part = '' ++head_parts = [] ++for part in path_parts: ++if part == '..': ++
[OE-core] [CONSOLIDATED PULL 06/16] default-versions: Update pulseaudio as arm no longer needs a seperate backport
Signed-off-by: Saul Wold s...@linux.intel.com --- meta/conf/distro/include/default-versions.inc |4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc index 377aba5..e3ef1e6 100644 --- a/meta/conf/distro/include/default-versions.inc +++ b/meta/conf/distro/include/default-versions.inc @@ -1,9 +1,7 @@ # # Default preferred versions # -PULSEAUDIOVERSION ?= 0.9.22 -PULSEAUDIOVERSION_arm ?= 0.9.15 -PREFERRED_VERSION_pulseaudio ?= ${PULSEAUDIOVERSION} +PREFERRED_VERSION_pulseaudio ?= 0.9.23 # Force the python versions in one place PYTHON_BASEVERSION ?= 2.6 -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 11/16] util-linux: Replace sigsetmask with posix compliant functions
From: Khem Raj raj.k...@gmail.com This patch is not needed upstream since the code using sigsetmask has been deleted. Signed-off-by: Khem Raj raj.k...@gmail.com --- .../util-linux-2.19.1/remove_sigsetmark.patch | 35 meta/recipes-core/util-linux/util-linux_2.19.1.bb |3 +- 2 files changed, 37 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch new file mode 100644 index 000..02e4d16 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch @@ -0,0 +1,35 @@ +simpleinit: remove deprecated sigsetmask() + +The sigsetmask() is deprecated in favor of sigprocmask(). + +This is not needed upstream since simpleinit is removed from +util-linux-ng master + +Signed-off-by: Khem Raj raj.k...@gmail.com + +Upstream-Status: Inappropriate + +Index: util-linux-2.19.1/simpleinit/shutdown.c +=== +--- util-linux-2.19.1.orig/simpleinit/shutdown.c 2011-03-04 03:47:47.0 -0800 util-linux-2.19.1/simpleinit/shutdown.c2011-07-06 08:43:39.183849752 -0700 +@@ -145,7 +145,7 @@ + { + int c, i, fd; + char *ptr; +- ++ sigset_t sigmask; + i = getdtablesize (); + for (fd = 3; fd i; fd++) close (fd); + if (getpid () == 1) +@@ -153,7 +153,9 @@ + for (fd = 0; fd 3; fd++) close (fd); + while (1) wait (NULL); /* Grim reaper never stops */ + } +- sigsetmask (0); /* simpleinit(8) blocks all signals: undo for ALRM */ ++ /* simpleinit(8) blocks all signals: undo for ALRM */ ++ sigemptyset(sigmask); ++ sigprocmask (SIG_SETMASK, sigmask, NULL); + for (i = 1; i NSIG; i++) signal (i, SIG_DFL); + + setlocale(LC_ALL, ); diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb index 0fd67d1..2ef95e6 100644 --- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb @@ -1,5 +1,5 @@ MAJOR_VERSION = 2.19 -PR = r2 +PR = r3 require util-linux.inc # note that `lscpu' is under GPLv3+ @@ -8,6 +8,7 @@ LICENSE_util-linux-lscpu = GPLv3+ SRC_URI += file://util-linux-ng-replace-siginterrupt.patch \ file://util-linux-ng-2.16-mount_lock_path.patch \ file://uclibc-__progname-conflict.patch \ +file://remove_sigsetmark.patch \ SRC_URI[md5sum] = 3eab06f05163dfa65479c44e5231932c -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 07/16] mesa-xlib, mesa-dri: Probe for newlocale() before using it.
From: Khem Raj raj.k...@gmail.com Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/recipes-graphics/mesa/mesa-dri/uclibc.patch | 40 ++ meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb|6 ++- meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb |5 ++- 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-graphics/mesa/mesa-dri/uclibc.patch diff --git a/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch b/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch new file mode 100644 index 000..bb5af44 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch @@ -0,0 +1,40 @@ +Index: Mesa-7.10.2/src/mesa/main/imports.c +=== +--- Mesa-7.10.2.orig/src/mesa/main/imports.c 2011-03-01 12:57:29.0 -0800 Mesa-7.10.2/src/mesa/main/imports.c2011-07-20 19:08:49.441785510 -0700 +@@ -757,7 +757,7 @@ + float + _mesa_strtof( const char *s, char **end ) + { +-#if defined(_GNU_SOURCE) !defined(__CYGWIN__) !defined(__FreeBSD__) ++#if defined(_GNU_SOURCE) !defined(__CYGWIN__) !defined(__FreeBSD__) defined (HAVE_NEWLOCALE) +static locale_t loc = NULL; +if (!loc) { + loc = newlocale(LC_CTYPE_MASK, C, NULL); +Index: Mesa-7.10.2/src/glsl/strtod.c +=== +--- Mesa-7.10.2.orig/src/glsl/strtod.c 2011-01-03 16:45:51.0 -0800 Mesa-7.10.2/src/glsl/strtod.c 2011-07-20 19:10:21.441785488 -0700 +@@ -44,7 +44,7 @@ + double + glsl_strtod(const char *s, char **end) + { +-#if defined(_GNU_SOURCE) !defined(__CYGWIN__) !defined(__FreeBSD__) ++#if defined(_GNU_SOURCE) !defined(__CYGWIN__) !defined(__FreeBSD__) defined (HAVE_NEWLOCALE) +static locale_t loc = NULL; +if (!loc) { + loc = newlocale(LC_CTYPE_MASK, C, NULL); +Index: Mesa-7.10.2/configure.ac +=== +--- Mesa-7.10.2.orig/configure.ac 2011-07-20 19:09:02.0 -0700 Mesa-7.10.2/configure.ac 2011-07-20 19:09:57.121785492 -0700 +@@ -450,6 +450,9 @@ + dnl See if posix_memalign is available + AC_CHECK_FUNC([posix_memalign], [DEFINES=$DEFINES -DHAVE_POSIX_MEMALIGN]) + ++dnl See if newlocale is available ++AC_CHECK_FUNCS_ONCE(newlocale) ++ + dnl SELinux awareness. + AC_ARG_ENABLE([selinux], + [AS_HELP_STRING([--enable-selinux], diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb index c7bd974..aac7a1c 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb @@ -8,10 +8,12 @@ LIB_DEPS = libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat DEPENDS = ${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native -PR = r0 +PR = r1 SRC_URI = ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ - file://crossfix.patch + file://crossfix.patch \ + file://uclibc.patch \ + SRC_URI[md5sum] = f5de82852f1243f42cc004039e10b771 SRC_URI[sha256sum] = 8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1 diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb index b77df2c..511103d 100644 --- a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb +++ b/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb @@ -1,6 +1,9 @@ include mesa-common.inc +FILESPATH =. ${FILE_DIRNAME}/mesa-dri: + SRC_URI = ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ + file://uclibc.patch \ SRC_URI[md5sum] = f5de82852f1243f42cc004039e10b771 @@ -14,6 +17,6 @@ LIB_DEPS = virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ DEPENDS = ${PROTO_DEPS} ${LIB_DEPS} makedepend-native PE = 1 -PR = r0 +PR = r1 EXTRA_OECONF += --with-driver=xlib -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/20] July 21, 2011
On Jul 21, 2011, at 3:43 PM, Richard Purdie wrote: On Thu, 2011-07-21 at 00:52 -0700, Saul Wold wrote: Review and tested, the inherit perlnatives are needed. The following changes since commit 0d03800caffc2341b74190d38f7a372223c89f4c: lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib (2011-07-20 15:43:43 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage Martin Jansa (9): tcmode-default: set preferred version also for (e)glibc-locale eglibc-package: don't fail without localedef/gconv python: save Makefile.sysroot in do_compile python: add patch to fix cross compilation on host with linux-3.0 polkit: inherit perlnative shared-mime-info: inherit perlnative xkeyboard-config: inherit perlnative avahi: inherit perlnative vte: inherit perlnative Matthew McClintock (2): Add endianess macros used by previous endian-ness_handling.patch Make intltool use perlnative instead of perl on host Saul Wold (2): clutter-box2d: fix isfinite.patch gettext: Add depends to gettext to avoid host contamination Tom Rini (7): python-native: Mangle scripts to use /usr/bin/env python, bump PR gnome-doc-utils: Use /usr/bin/env python in xml2po, bump PR perl-native: Add a perl-native wrapper in the normal bindir cpan.bbclass: Perform more mangling for perl path icon-naming-utils-native: Fix long path to perl in icon-name-mapping siteinfo.bbclass: Port over oe.dev logic for site files local.conf.sample: Add a note about ASSUME_PROVIDED for help2man Thanks Saul, I merged this minus the perlnative pieces since I think we might be able to solve this in a better way and we should at least discuss that. Cheers, Richard The version of: clutter-box2d: fix isfinite.patch in poky.git seems to still be broken - k ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 06/16] default-versions: Update pulseaudio as arm no longer needs a seperate backport
Op 22 jul. 2011, om 09:25 heeft Saul Wold het volgende geschreven: Signed-off-by: Saul Wold s...@linux.intel.com --- meta/conf/distro/include/default-versions.inc |4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc index 377aba5..e3ef1e6 100644 --- a/meta/conf/distro/include/default-versions.inc +++ b/meta/conf/distro/include/default-versions.inc @@ -1,9 +1,7 @@ # # Default preferred versions # -PULSEAUDIOVERSION ?= 0.9.22 -PULSEAUDIOVERSION_arm ?= 0.9.15 -PREFERRED_VERSION_pulseaudio ?= ${PULSEAUDIOVERSION} +PREFERRED_VERSION_pulseaudio ?= 0.9.23 If you do that you need to rebuild things linking against pulse as well, e.g. gst-plugins-good. I haven't checked if gst actually depends on pull in oe-core though. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/20] July 21, 2011
On Fri, 2011-07-22 at 02:49 -0500, Kumar Gala wrote: On Jul 21, 2011, at 3:43 PM, Richard Purdie wrote: On Thu, 2011-07-21 at 00:52 -0700, Saul Wold wrote: Review and tested, the inherit perlnatives are needed. The following changes since commit 0d03800caffc2341b74190d38f7a372223c89f4c: lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib (2011-07-20 15:43:43 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage Martin Jansa (9): tcmode-default: set preferred version also for (e)glibc-locale eglibc-package: don't fail without localedef/gconv python: save Makefile.sysroot in do_compile python: add patch to fix cross compilation on host with linux-3.0 polkit: inherit perlnative shared-mime-info: inherit perlnative xkeyboard-config: inherit perlnative avahi: inherit perlnative vte: inherit perlnative Matthew McClintock (2): Add endianess macros used by previous endian-ness_handling.patch Make intltool use perlnative instead of perl on host Saul Wold (2): clutter-box2d: fix isfinite.patch gettext: Add depends to gettext to avoid host contamination Tom Rini (7): python-native: Mangle scripts to use /usr/bin/env python, bump PR gnome-doc-utils: Use /usr/bin/env python in xml2po, bump PR perl-native: Add a perl-native wrapper in the normal bindir cpan.bbclass: Perform more mangling for perl path icon-naming-utils-native: Fix long path to perl in icon-name-mapping siteinfo.bbclass: Port over oe.dev logic for site files local.conf.sample: Add a note about ASSUME_PROVIDED for help2man Thanks Saul, I merged this minus the perlnative pieces since I think we might be able to solve this in a better way and we should at least discuss that. Cheers, Richard The version of: clutter-box2d: fix isfinite.patch in poky.git seems to still be broken There is something in my patch workflow which seems to corrupt dos line endings. I've manually fixed the patches which were out of sync in poky compared with OE-Core and am looking into how this happened with a view to fixing the scripts. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] site/powerpc: Pull all powerpc config options into powerpc32-linux
powerpc-common was really Linux PPC32 specific. So move all the options in it to powerpc32-linux and we can refactor out common bits shared between into powerpc-linux and powerpc-common. Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- meta/classes/siteinfo.bbclass |4 +- meta/site/powerpc-common | 328 --- meta/site/powerpc-linux |9 - meta/site/powerpc32-linux | 338 + 4 files changed, 340 insertions(+), 339 deletions(-) create mode 100644 meta/site/powerpc32-linux diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index ff9fd0d..d0d405a 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -33,10 +33,10 @@ def siteinfo_data(d): mips64: endian-big bit-64 mips64-common, mips64el: endian-little bit-64 mips64-common, mipsel: endian-little bit-32 mips-common, -powerpc: endian-big bit-32 powerpc-common, +powerpc: endian-big bit-32 powerpc-common powerpc32-linux, nios2: endian-little bit-32 nios2-common, powerpc64: endian-big bit-64 powerpc-common powerpc64-linux, -ppc: endian-big bit-32 powerpc-common, +ppc: endian-big bit-32 powerpc-common powerpc32-linux, ppc64: endian-big bit-64 powerpc-common powerpc64-linux, sh3: endian-little bit-32 sh-common, sh4: endian-little bit-32 sh-common, diff --git a/meta/site/powerpc-common b/meta/site/powerpc-common index 4d0378b..e69de29 100644 --- a/meta/site/powerpc-common +++ b/meta/site/powerpc-common @@ -1,328 +0,0 @@ -ac_cv_func_getpgrp_void=yes -ac_cv_func_setpgrp_void=yes -ac_cv_func_setgrent_void=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_malloc_works=yes -ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} -ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} -ac_cv_func_setvbuf_reversed=no -ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} -ac_cv_sizeof_bool=${ac_cv_sizeof_bool=1} -ac_cv_sizeof_char=${ac_cv_sizeof_char=1} -ac_cv_sizeof_double=${ac_cv_sizeof_double=8} -ac_cv_sizeof_int=${ac_cv_sizeof_int=4} -ac_cv_sizeof_int_p=${ac_cv_sizeof_int_p=4} -ac_cv_sizeof_float=${ac_cv_sizeof_float=4} -ac_cv_sizeof_long=${ac_cv_sizeof_long=4} -ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=4} -ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8} -ac_cv_sizeof_short=${ac_cv_sizeof_short=2} -ac_cv_sizeof_unsigned_char=${ac_cv_sizeof_unsigned_char=1} -ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2} -ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4} -ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4} -ac_cv_sizeof_long_p=${ac_cv_sizeof_long_p=4} -ac_cv_sizeof_wchar_t=${ac_cv_sizeof_wchar_t=4} -ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8} -ac_cv_sys_restartable_syscalls=yes -ac_cv_type___int64=${ac_cv_type___int64=no} -ac_cv_type_size_t=${ac_cv_type_size_t=yes} -ac_cv_type_void_p=${ac_cv_type_void_p=yes} -ac_cv_uchar=${ac_cv_uchar=no} -ac_cv_uint=${ac_cv_uint=yes} -ac_cv_ulong=${ac_cv_ulong=yes} -ac_cv_ushort=${ac_cv_ushort=yes} -ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} -cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes} - - -# apache -ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} -apr_cv_process_shared_works=${apr_cv_process_shared_works=no} -ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} - -ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} -ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} -ac_cv_sctp=${ac_cv_sctp=no} - -# ssh -ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes} -ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no} -ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} -ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes} -ac_cv_type_struct_timespec=${ac_cv_type_struct_timespec=yes} -ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes} - -# coreutils -utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} - -# libpcap -ac_cv_linux_vers=${ac_cv_linux_vers=2} - -# nano -ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} -nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} - - -# libnet -ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} - -# screen -screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no} -screen_cv_sys_memcpy_overlap=${screen_cv_sys_memcpy_overlap=no} -screen_cv_sys_memmove_overlap=${screen_cv_sys_memmove_overlap=no} -screen_cv_sys_fifo_broken_impl=${screen_cv_sys_fifo_broken_impl=yes} -screen_cv_sys_fifo_usable=${screen_cv_sys_fifo_usable=yes} -screen_cv_sys_select_broken_retval=${screen_cv_sys_select_broken_retval=no} -screen_cv_sys_sockets_nofs=${screen_cv_sys_sockets_nofs=no} -screen_cv_sys_sockets_usable=${screen_cv_sys_sockets_usable=yes} -screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes} -
[OE-core] [PATCH 2/4] site/powerpc64: Update power64-linux to include powerpc-linux
Now that we have a unique powerpc32-linux config, we share powerpc-linux between ppc32 ppc64. Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- meta/classes/siteinfo.bbclass |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index d0d405a..c5308b3 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -35,9 +35,9 @@ def siteinfo_data(d): mipsel: endian-little bit-32 mips-common, powerpc: endian-big bit-32 powerpc-common powerpc32-linux, nios2: endian-little bit-32 nios2-common, -powerpc64: endian-big bit-64 powerpc-common powerpc64-linux, +powerpc64: endian-big bit-64 powerpc-common powerpc-linux powerpc64-linux, ppc: endian-big bit-32 powerpc-common powerpc32-linux, -ppc64: endian-big bit-64 powerpc-common powerpc64-linux, +ppc64: endian-big bit-64 powerpc-common powerpc-linux powerpc64-linux, sh3: endian-little bit-32 sh-common, sh4: endian-little bit-32 sh-common, sparc: endian-big bit-32, -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] site/powerpc64-linux: Start initial site config
Use ac_cv_sizeof_* from eglibc as starting point for powerpc64-linux site info. We will refactor common bits that are needed out of powerpc32-linux based on build issues. Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- meta/site/powerpc64-linux | 21 + 1 files changed, 21 insertions(+), 0 deletions(-) create mode 100644 meta/site/powerpc64-linux diff --git a/meta/site/powerpc64-linux b/meta/site/powerpc64-linux new file mode 100644 index 000..9430ea1 --- /dev/null +++ b/meta/site/powerpc64-linux @@ -0,0 +1,21 @@ +ac_cv_sizeof_char=${ac_cv_sizeof_char=1} +ac_cv_sizeof_char_p=${ac_cv_sizeof_char_p=8} +ac_cv_sizeof_double=${ac_cv_sizeof_double=8} +ac_cv_sizeof_float=${ac_cv_sizeof_float=4} +ac_cv_sizeof_int=${ac_cv_sizeof_int=4} +ac_cv_sizeof_long=${ac_cv_sizeof_long=8} +ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=16} +ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=8} +ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8} +ac_cv_sizeof_long_long_int=${ac_cv_sizeof_long_long_int=8} +ac_cv_sizeof_short=${ac_cv_sizeof_short=2} +ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2} +ac_cv_sizeof_signed_char=${ac_cv_sizeof_signed_char=1} +ac_cv_sizeof_unsigned_char=${ac_cv_sizeof_unsigned_char=1} +ac_cv_sizeof_unsigned_int=${ac_cv_sizeof_unsigned_int=4} +ac_cv_sizeof_unsigned_long=${ac_cv_sizeof_unsigned_long=8} +ac_cv_sizeof_unsigned_long_int=${ac_cv_sizeof_unsigned_long_int=8} +ac_cv_sizeof_unsigned_long_long_int=${ac_cv_sizeof_unsigned_long_long_int=8} +ac_cv_sizeof_unsigned_short=${ac_cv_sizeof_unsigned_short=2} +ac_cv_sizeof_unsigned_short_int=${ac_cv_sizeof_unsigned_short_int=2} +ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=8} -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] site/powerpc*-linux: refactor needed options that are common
Pulled common options that are needed for powerpc64-linux to build out of powerpc32-linux and put them into powerpc-linux. Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- meta/site/powerpc-linux | 24 meta/site/powerpc32-linux | 19 --- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/meta/site/powerpc-linux b/meta/site/powerpc-linux index e69de29..9498b8a 100644 --- a/meta/site/powerpc-linux +++ b/meta/site/powerpc-linux @@ -0,0 +1,24 @@ +ac_cv_func_getpgrp_void=yes +ac_cv_func_setpgrp_void=yes +ac_cv_func_setgrent_void=yes +ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} +ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} + +# bash +bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} + +# startup-notification +lf_cv_sane_realloc=yes + +# flex +ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} +ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} + +# glib +glib_cv_stack_grows=${glib_cv_stack_grows=no} +glib_cv_uscore=${glib_cv_uscore=no} +ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} + +# popt/rpm +ac_cv_va_copy=${ac_cv_va_copy=yes} +ac_cv___va_copy=${ac_cv___va_copy=yes} diff --git a/meta/site/powerpc32-linux b/meta/site/powerpc32-linux index bd45ea6..33ad786 100644 --- a/meta/site/powerpc32-linux +++ b/meta/site/powerpc32-linux @@ -1,10 +1,5 @@ -ac_cv_func_getpgrp_void=yes -ac_cv_func_setpgrp_void=yes -ac_cv_func_setgrent_void=yes ac_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_works=yes -ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} -ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} ac_cv_func_setvbuf_reversed=no ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} ac_cv_sizeof_bool=${ac_cv_sizeof_bool=1} @@ -128,20 +123,16 @@ am_cv_func_working_getline=${am_cv_func_working_getline=yes} # glib glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} -glib_cv_stack_grows=${glib_cv_stack_grows=no} -glib_cv_uscore=${glib_cv_uscore=no} glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes} glib_cv_has__inline=${glib_cv_has__inline=yes} glib_cv_has__inline__=${glib_cv_has__inline__=yes} glib_cv_hasinline=${glib_cv_hasinline=yes} glib_cv_sane_realloc=${glib_cv_sane_realloc=yes} glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} -glib_cv_uscore=${glib_cv_uscore=no} glib_cv_va_copy=${glib_cv_va_copy=no} glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} glib_cv___va_copy=${glib_cv___va_copy=yes} glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no} -ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} glib_cv_sys_pthread_mutex_trylock_posix=${glib_cv_sys_pthread_mutex_trylock_posix=yes} glib_cv_sys_pthread_getspecific_posix=${glib_cv_sys_pthread_getspecific_posix=yes} glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_posix=yes} @@ -187,14 +178,9 @@ compat_cv_func_dirname_works=${compat_cv_func_dirname_works=no} slrn_cv___va_copy=${slrn_cv___va_copy=yes} slrn_cv_va_copy=${slrn_cv_va_copy=no} slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} -ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} -ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} -# startup-notification -lf_cv_sane_realloc=yes - # libidl libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} @@ -218,7 +204,6 @@ cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} # bash ac_cv_c_long_double=${ac_cv_c_long_double=yes} -bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} @@ -341,7 +326,3 @@ libc_cv_ppc_machine=${libc_cv_ppc_machine=yes} libc_cv_mlong_double_128ibm=${libc_cv_mlong_double_128ibm=yes} libc_cv_mabi_ibmlongdouble=${libc_cv_mabi_ibmlongdouble=yes} libc_cv_mlong_double_128=${libc_cv_mlong_double_128=yes} - -# popt -ac_cv_va_copy=${ac_cv_va_copy=yes} -ac_cv___va_copy=${ac_cv___va_copy=yes} -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] libart-lgpl: Add missing config file - allows builds on PowerPC 64
Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- .../gnome/libart-lgpl/powerpc64/art_config.h | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-gnome/gnome/libart-lgpl/powerpc64/art_config.h diff --git a/meta/recipes-gnome/gnome/libart-lgpl/powerpc64/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/powerpc64/art_config.h new file mode 100644 index 000..500ffc3 --- /dev/null +++ b/meta/recipes-gnome/gnome/libart-lgpl/powerpc64/art_config.h @@ -0,0 +1,10 @@ +/* Automatically generated by gen_art_config.c */ + +#define ART_SIZEOF_CHAR 1 +#define ART_SIZEOF_SHORT 2 +#define ART_SIZEOF_INT 4 +#define ART_SIZEOF_LONG 8 + +typedef unsigned char art_u8; +typedef unsigned short art_u16; +typedef unsigned int art_u32; -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] libc: Add handling of powerpc64
Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- meta/classes/libc-package.bbclass |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 7cfeb7d..de57230 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -266,6 +266,7 @@ python package_do_split_gconvs () { locale_arch_options = { \ arm: --uint32-align=4 --little-endian , \ powerpc: --uint32-align=4 --big-endian , \ + powerpc64: --uint32-align=4 --big-endian , \ mips: --uint32-align=4 --big-endian , \ mipsel: --uint32-align=4 --little-endian , \ i586: --uint32-align=4 --little-endian , \ -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] openssl: Add handling for building on linux-powerpc64
If try to build for an ppc64 target openssl will fail to build since the configure script didn't know how to handle a 'linux-powerpc64' target. Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- meta/recipes-connectivity/openssl/openssl.inc |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 79620b3..b134ad0 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -83,6 +83,9 @@ do_configure () { linux-gnuspe-powerpc) target=linux-ppc ;; + linux-powerpc64) + target=linux-ppc64 + ;; linux-supersparc) target=linux-sparcv8 ;; -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] kernel-arch: Add handling of powerpc64
Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- meta/classes/kernel-arch.bbclass |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass index 86c15d3..225d599 100644 --- a/meta/classes/kernel-arch.bbclass +++ b/meta/classes/kernel-arch.bbclass @@ -6,7 +6,7 @@ valid_archs = alpha cris ia64 \ i386 x86 \ - m68knommu m68k ppc powerpc ppc64 \ + m68knommu m68k ppc powerpc powerpc64 ppc64 \ sparc sparc64 \ arm arm26 \ m32r mips \ @@ -24,6 +24,7 @@ def map_kernel_arch(a, d): elif re.match('arm26$', a): return 'arm26' elif re.match('armeb$', a): return 'arm' elif re.match('mipsel$', a):return 'mips' + elif re.match('p(pc|owerpc)(|64)', a): return 'powerpc' elif re.match('sh(3|4)$', a): return 'sh' elif re.match('bfin', a): return 'blackfin' elif re.match('microblazeel', a): return 'microblaze' @@ -36,7 +37,7 @@ export ARCH = ${@map_kernel_arch(bb.data.getVar('TARGET_ARCH', d, 1), d)} def map_uboot_arch(a, d): import re - if re.match('powerpc$', a): return 'ppc' + if re.match('p(pc|owerpc)(|64)', a): return 'ppc' elif re.match('i.86$', a): return 'x86' return a -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/20] July 21, 2011
On Fri, 2011-07-22 at 10:05 +0100, Richard Purdie wrote: On Fri, 2011-07-22 at 02:49 -0500, Kumar Gala wrote: On Jul 21, 2011, at 3:43 PM, Richard Purdie wrote: On Thu, 2011-07-21 at 00:52 -0700, Saul Wold wrote: Review and tested, the inherit perlnatives are needed. The following changes since commit 0d03800caffc2341b74190d38f7a372223c89f4c: lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib (2011-07-20 15:43:43 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage Martin Jansa (9): tcmode-default: set preferred version also for (e)glibc-locale eglibc-package: don't fail without localedef/gconv python: save Makefile.sysroot in do_compile python: add patch to fix cross compilation on host with linux-3.0 polkit: inherit perlnative shared-mime-info: inherit perlnative xkeyboard-config: inherit perlnative avahi: inherit perlnative vte: inherit perlnative Matthew McClintock (2): Add endianess macros used by previous endian-ness_handling.patch Make intltool use perlnative instead of perl on host Saul Wold (2): clutter-box2d: fix isfinite.patch gettext: Add depends to gettext to avoid host contamination Tom Rini (7): python-native: Mangle scripts to use /usr/bin/env python, bump PR gnome-doc-utils: Use /usr/bin/env python in xml2po, bump PR perl-native: Add a perl-native wrapper in the normal bindir cpan.bbclass: Perform more mangling for perl path icon-naming-utils-native: Fix long path to perl in icon-name-mapping siteinfo.bbclass: Port over oe.dev logic for site files local.conf.sample: Add a note about ASSUME_PROVIDED for help2man Thanks Saul, I merged this minus the perlnative pieces since I think we might be able to solve this in a better way and we should at least discuss that. Cheers, Richard The version of: clutter-box2d: fix isfinite.patch in poky.git seems to still be broken There is something in my patch workflow which seems to corrupt dos line endings. I've manually fixed the patches which were out of sync in poky compared with OE-Core and am looking into how this happened with a view to fixing the scripts. The reason is we need to use git am --keep-cr. I've updated my local scripts and we're also checking the layer handling tools. I haven't switched to them yet as we haven't had a lull in the patches to allow me to make the transition. I've got that pencilled in for after multilib is done. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] Add support for powerpc64
Add various cleanups to core scripts and packages that are needed for building for a 64-bit powerpc target. - k ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] consolekit 0.4.5: fix PAM installation dir
Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- .../recipes-support/consolekit/consolekit_0.4.5.bb |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb index 661cca6..562dfb3 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = ConsoleKit is a framework for defining and tracking users, login HOMEPAGE=http://www.freedesktop.org/wiki/Software/ConsoleKit; BUGTRACKER=https://bugs.freedesktop.org/buglist.cgi?query_format=specificproduct=ConsoleKit; -PR = r4 +PR = r5 LICENSE = GPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ @@ -20,12 +20,13 @@ SRC_URI[sha256sum] = 43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b22368 S = ${WORKDIR}/ConsoleKit-${PV} EXTRA_OECONF = --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \ -${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module --with-pam-module-dir=${libdir}/security', '--disable-pam-module', d)} \ +${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module --with-pam-module-dir=${base_libdir}/security', '--disable-pam-module', d)} \ FILES_${PN} += ${libdir}/ConsoleKit ${base_libdir} ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit* +FILES_${PN}-dbg += ${base_libdir}/security/.debug PACKAGES =+ pam-plugin-ck-connector -FILES_pam-plugin-ck-connector += ${libdir}/security/*.so +FILES_pam-plugin-ck-connector += ${base_libdir}/security/*.so RDEPENDS_pam-plugin-ck-connector += ${PN} -- 1.6.6.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] site/powerpc*-linux: refactor needed options that are common
On Fri, 2011-07-22 at 04:17 -0500, Kumar Gala wrote: Pulled common options that are needed for powerpc64-linux to build out of powerpc32-linux and put them into powerpc-linux. Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- meta/site/powerpc-linux | 24 meta/site/powerpc32-linux | 19 --- 2 files changed, 24 insertions(+), 19 deletions(-) Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] consolekit 0.4.5: fix PAM installation dir
On Fri, 2011-07-22 at 12:14 +0200, Koen Kooi wrote: Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- .../recipes-support/consolekit/consolekit_0.4.5.bb |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gnome-keyring 2.32.1: fix PAM support and make it conditional on DISTRO_FEATURES
On Fri, 2011-07-22 at 12:09 +0200, Koen Kooi wrote: The plugin got installed into the wrong dir leading to: gdm-session-worker[515]: PAM unable to dlopen(/lib/security/pam_gnome_keyring.so): /lib/security/pam_gnome_keyring.so: cannot open shared object file: No such file or directory Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH 4/4] site/powerpc*-linux: refactor needed options that are common
On Thu, 2011-07-21 at 17:07 -0700, Tom Rini wrote: On 07/21/2011 03:30 PM, Kumar Gala wrote: Pulled common options that are needed for powerpc64-linux to build out of powerpc32-linux and put them into powerpc-linux. Signed-off-by: Kumar Gala ga...@kernel.crashing.org NAK. Almost all of the stuff going into powerpc-linux really belongs in common-linux or common-glibc. Some other tasks held me up here but I plan to post the series moving these bits over and dropping them from the arch files tomorrow. Rest of the series looks good tho Sorry, my email reading order wasn't good here and I missed this comment. I wanted to get the series in since I know this and the stuff Tom is looking at will likely conflict a bit. Kumar's work improves the situation so I've merged it. Obviously there is still other improvements we can have. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] site/powerpc: Pull all powerpc config options into powerpc32-linux
On Fri, 2011-07-22 at 04:16 -0500, Kumar Gala wrote: powerpc-common was really Linux PPC32 specific. So move all the options in it to powerpc32-linux and we can refactor out common bits shared between into powerpc-linux and powerpc-common. Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- meta/classes/siteinfo.bbclass |4 +- meta/site/powerpc-common | 328 --- meta/site/powerpc-linux |9 - meta/site/powerpc32-linux | 338 + 4 files changed, 340 insertions(+), 339 deletions(-) create mode 100644 meta/site/powerpc32-linux I've merged patches 1-4 to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [v2 PATCH 0/2] upgrade tcf-agent to the latest stable revision 0.0+svnr1855
Changes from the previous version: 1) add DEPENDS = util-linux to resolve the uuid.h issue fatal error: uuid/uuid.h: No such file or directory | compilation 2) add RDEPENDS_${PN} = bash buxybox's sh doesn't work with tcf-agent, so we need bash. 3) update MAKE_OS: MAKE_OS = `echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux,` e.g., for qemuarm, we need to change linux-gnueabi to GNU/Linux. This is necessary due to the new tcf-agent's Makefile's coding. 4) add +# They don't build on ARM and we don't need them actually. +CFLAGS += -DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ +-DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ +-DSERVICE_StackTrace=0 -DSERVICE_Symbols=0 -DSERVICE_LineNumbers=0 \ +-DSERVICE_Expressions=0 Lianhao and Dexuan tested the v2 patches on qemux86, qemux86-64, qemuarm, qemuppc and qemumips with both incremental and full building, and runtime testings. Thanks, -- Lianhao and Dexuan The following changes since commit 068839698fe192d8846c0ed4db65861448e8e524: eglibc: fix runtime assertion failure (2011-07-13 12:34:30 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib dcui/tcf-agent http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/tcf-agent Dexuan Cui (2): tcf-agent: upgrade to the latest stable revision 0.0+svnr1855 distro_tracking_fields.inc: update the info for tcf-agent .../conf/distro/include/distro_tracking_fields.inc | 12 +- .../tcf-agent/tcf-agent/fix_ranlib.patch | 14 + .../tcf-agent/tcf-agent/fix_tcf-agent.init.patch | 14 +- .../tcf-agent/tcf-agent/terminals_agent.patch | 1027 meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb | 32 +- 5 files changed, 50 insertions(+), 1049 deletions(-) create mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch delete mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch -- 1.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [v2 PATCH 1/2] tcf-agent: upgrade to the latest stable revision 0.0+svnr1855
Signed-off-by: Lianhao Lu lianhao...@intel.com Signed-off-by: Dexuan Cui dexuan@intel.com --- .../tcf-agent/tcf-agent/fix_ranlib.patch | 14 + .../tcf-agent/tcf-agent/fix_tcf-agent.init.patch | 14 +- .../tcf-agent/tcf-agent/terminals_agent.patch | 1027 meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb | 32 +- 4 files changed, 44 insertions(+), 1043 deletions(-) create mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch delete mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch new file mode 100644 index 000..5d70456 --- /dev/null +++ b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch @@ -0,0 +1,14 @@ +Upstream-Status: Inappropriate [poky-specific fix] + +--- a/Makefile.inc b/Makefile.inc +@@ -57,6 +57,9 @@ + ifeq ($(NO_UUID),) + LIBS += -luuid + endif ++ ifneq ($(RANLIB),) ++RANLIB += $@ ++ endif + endif + + ifneq ($(OPSYS),Windows) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch index 60b0b27..fefaf04 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch +++ b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch @@ -2,15 +2,15 @@ Upstream-Status: Inappropriate [poky-specific script] --- a/Makefile +++ b/Makefile -@@ -32,7 +32,7 @@ - install -d -m 755 $(INSTALLROOT)$(SBIN) - install -d -m 755 $(INSTALLROOT)$(INIT) +@@ -64,7 +64,7 @@ + install -d -m 755 $(INSTALLROOT)$(INCLUDE)/tcf/services install -c $(BINDIR)/agent -m 755 $(INSTALLROOT)$(SBIN)/tcf-agent -- install -c $(TCF_AGENT_DIR)/main/tcf-agent.init -m 755 $(INSTALLROOT)$(INIT)/tcf-agent + install -c $(BINDIR)/client -m 755 $(INSTALLROOT)$(SBIN)/tcf-client +- install -c main/tcf-agent.init -m 755 $(INSTALLROOT)$(INIT)/tcf-agent + install -c tcf-agent.init -m 755 $(INSTALLROOT)$(INIT)/tcf-agent - - clean: - rm -rf $(BINDIR) + install -c config.h -m 755 $(INSTALLROOT)$(INCLUDE)/tcf/config.h + install -c -t $(INSTALLROOT)$(INCLUDE)/tcf/framework -m 644 framework/*.h + install -c -t $(INSTALLROOT)$(INCLUDE)/tcf/services -m 644 services/*.h --- /dev/null +++ b/tcf-agent.init @@ -0,0 +1,78 @@ diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch deleted file mode 100644 index aed62fa..000 --- a/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch +++ /dev/null @@ -1,1027 +0,0 @@ -Upstream-Status: Inappropriate [source code; we'll remove it when upgrading tcf-agent in future] - -Index: org.eclipse.tm.tcf.terminals.agent/terminals.c -=== org.eclipse.tm.tcf.terminals.agent/terminals.c (revision 0) -+++ org.eclipse.tm.tcf.terminals.agent/terminals.c (revision 0) -@@ -0,0 +1,846 @@ -+/*** -+ * Copyright (c) 2008 Wind River Systems, Inc. and others. -+ * All rights reserved. This program and the accompanying materials -+ * are made available under the terms of the Eclipse Public License v1.0 -+ * and Eclipse Distribution License v1.0 which accompany this distribution. -+ * The Eclipse Public License is available at -+ * http://www.eclipse.org/legal/epl-v10.html -+ * and the Eclipse Distribution License is available at -+ * http://www.eclipse.org/org/documents/edl-v10.php. -+ * -+ * Contributors: -+ * Wind River Systems - initial API and implementation -+ ***/ -+ -+/* -+ * Sample TCF service implementation. -+ */ -+ -+#include config.h -+#include stdlib.h -+#include stdio.h -+#include string.h -+#include errno.h -+#include fcntl.h -+#include signal.h -+#include assert.h -+#include termios.h -+#ifndef TIOCGWINSZ -+#include sys/ioctl.h -+#endif -+#include framework/myalloc.h -+#include framework/protocol.h -+#include framework/trace.h -+#include framework/context.h -+#include framework/json.h -+#include framework/asyncreq.h -+#include framework/exceptions.h -+#include framework/waitpid.h -+#include framework/signames.h -+#include services/streamsservice.h -+#include terminals.h -+ -+#define TERMINALS_DEBUG 1 -+ -+#define TERMINALS_NO_LOGIN 0 -+ -+static const char * TERMINALS = Terminals; -+ -+#if defined(WIN32) -+# include tlhelp32.h -+# ifdef _MSC_VER -+#pragma warning(disable:4201) /* nonstandard extension used : nameless struct/union (in winternl.h) */ -+#include winternl.h -+# else -+#include ntdef.h -+# endif -+# ifndef STATUS_INFO_LENGTH_MISMATCH -+# define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS)0xC004L) -+#
[OE-core] [v2 PATCH 2/2] distro_tracking_fields.inc: update the info for tcf-agent
Signed-off-by: Dexuan Cui dexuan@intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index efb4c0b..4de543e 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -2781,17 +2781,17 @@ RECIPE_MAINTAINER_pn-latencytop = Dexuan Cui dexuan@intel.com RECIPE_STATUS_pn-tcf-agent = green DISTRO_PN_ALIAS_pn-tcf-agent = WindRiver upstream=http://www.eclipse.org/dsdp/tm/; RECIPE_DEPENDENCY_CHECK_pn-tcf-agent = not done -RECIPE_LATEST_VERSION_pn-tcf-agent = 0.3.0+svnr1078 -RECIPE_MANUAL_CHECK_DATE_pn-tcf-agent = June 29, 2011 -RECIPE_NO_UPDATE_REASON_pn-tcf-agent = Do not upgrade to version: (998)? because upstraem hasn't defined a formal release tag. +RECIPE_LATEST_VERSION_pn-tcf-agent = 0.0+svnr1855 +RECIPE_MANUAL_CHECK_DATE_pn-tcf-agent = Jul 21, 2011 +RECIPE_NO_UPDATE_REASON_pn-tcf-agent = 1855 is the latest stable revision RECIPE_NO_OF_PATCHES_pn-tcf-agent = 2 -RECIPE_PATCH_pn-tcf-agent+terminals_agent = we might get the patch from git://git.yoctoproject.org/eclipse-poky.git in future RECIPE_PATCH_pn-tcf-agent+fix_tcf-agent.init = a proper script /etc/init.d/tcf-agent +RECIPE_PATCH_pn-tcf-agent+fix_ranlib = need to pass arguments to RANLIB RECIPE_INTEL_SECTION_pn-tcf-agent = sdk-tools RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-tcf-agent = 1+ years -RECIPE_LATEST_RELEASE_DATE_pn-tcf-agent = 07/2010 +RECIPE_LATEST_RELEASE_DATE_pn-tcf-agent = Jul 07, 2011 RECIPE_COMMENTS_pn-tcf-agent = -RECIPE_LAST_UPDATE_pn-tcf-agent = Jul 23, 2010 +RECIPE_LAST_UPDATE_pn-tcf-agent = Jul 21, 2011 RECIPE_MAINTAINER_pn-tcf-agent = Dexuan Cui dexuan@intel.com RECIPE_STATUS_pn-liburcu = green -- 1.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] tcf-agent: upgrade to the latest stable revision 0.0+svnr1855
Cui, Dexuan wrote on 2011-07-22: Saul Wold wrote on 2011-07-22: There seems to be a compile issue with this patch. Hi Saul, Lianhao and I have made the v2 patches and did tests. I sent out the patches just now. Please review them. Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] site/powerpc*-linux: refactor needed options that are common
On Jul 22, 2011, at 5:55 AM, Richard Purdie wrote: On Fri, 2011-07-22 at 04:17 -0500, Kumar Gala wrote: Pulled common options that are needed for powerpc64-linux to build out of powerpc32-linux and put them into powerpc-linux. Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- meta/site/powerpc-linux | 24 meta/site/powerpc32-linux | 19 --- 2 files changed, 24 insertions(+), 19 deletions(-) Merged to master, thanks. Richard I posted this more for Tom, but I'm sure he can refactor this where it really needs to go. - k ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc-4.6: Fix packaging of native toolchains
The base gcc package is missing liblto_plugin.so. If we try a simple hello world compile we get something like: root@p5020-ds:~# gcc hello.c gcc: fatal error: -fuse-linker-plugin, but liblto_plugin.so not found compilation terminated. We need to include liblto_plugin.so in the base gcc package and not gcc-dev. Signed-off-by: Kumar Gala ga...@kernel.crashing.org --- meta/recipes-devtools/gcc/gcc-4.6.inc|2 +- meta/recipes-devtools/gcc/gcc-package-target.inc |1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc index a724594..4c1e1e1 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 = r1 +PR = r2 # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0 diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc index e6105da..a0e5da4 100644 --- a/meta/recipes-devtools/gcc/gcc-package-target.inc +++ b/meta/recipes-devtools/gcc/gcc-package-target.inc @@ -17,6 +17,7 @@ FILES_${PN} = \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto*${SOLIBSDEV} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/5] kernel-arch: Add handling of powerpc64
On 07/22/2011 02:24 AM, Kumar Gala wrote: Signed-off-by: Kumar Gala ga...@kernel.crashing.org Acked-by: Tom Rini tom_r...@mentor.com --- meta/classes/kernel-arch.bbclass |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass index 86c15d3..225d599 100644 --- a/meta/classes/kernel-arch.bbclass +++ b/meta/classes/kernel-arch.bbclass @@ -6,7 +6,7 @@ valid_archs = alpha cris ia64 \ i386 x86 \ - m68knommu m68k ppc powerpc ppc64 \ + m68knommu m68k ppc powerpc powerpc64 ppc64 \ sparc sparc64 \ arm arm26 \ m32r mips \ @@ -24,6 +24,7 @@ def map_kernel_arch(a, d): elif re.match('arm26$', a): return 'arm26' elif re.match('armeb$', a): return 'arm' elif re.match('mipsel$', a):return 'mips' + elif re.match('p(pc|owerpc)(|64)', a): return 'powerpc' elif re.match('sh(3|4)$', a): return 'sh' elif re.match('bfin', a): return 'blackfin' elif re.match('microblazeel', a): return 'microblaze' @@ -36,7 +37,7 @@ export ARCH = ${@map_kernel_arch(bb.data.getVar('TARGET_ARCH', d, 1), d)} def map_uboot_arch(a, d): import re - if re.match('powerpc$', a): return 'ppc' + if re.match('p(pc|owerpc)(|64)', a): return 'ppc' elif re.match('i.86$', a): return 'x86' return a -- Tom Rini Mentor Graphics Corporation ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/5] openssl: Add handling for building on linux-powerpc64
On 07/22/2011 02:24 AM, Kumar Gala wrote: If try to build for an ppc64 target openssl will fail to build since the configure script didn't know how to handle a 'linux-powerpc64' target. Signed-off-by: Kumar Gala ga...@kernel.crashing.org Acked-by: Tom Rini tom_r...@mentor.com --- meta/recipes-connectivity/openssl/openssl.inc |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 79620b3..b134ad0 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -83,6 +83,9 @@ do_configure () { linux-gnuspe-powerpc) target=linux-ppc ;; + linux-powerpc64) + target=linux-ppc64 + ;; linux-supersparc) target=linux-sparcv8 ;; -- Tom Rini Mentor Graphics Corporation ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] Add support for powerpc64
On 07/22/2011 02:24 AM, Kumar Gala wrote: Add various cleanups to core scripts and packages that are needed for building for a 64-bit powerpc target. Everything looks fine here, added my Ack's for bits I recall doing too :) -- Tom Rini Mentor Graphics Corporation ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] bitbake.conf/cross.bbclass: Add ability to dynamically change library location
Add the ability to dynamically change the library directory from lib to other values. This allows the tune files to specifiy altnerative ABIs which can be dynamically enabled by the multilib BBCLASSEXTEND code. A variety of approaches have been attempted with this, the immediate expansions in cross.bbclass being problematic as they are they are expanded before the bbclass extend event hander runs. This approach ensures the ${baselib} variable is retained in the expressions resolving that complication. Derived from some ideas from Mark Hatle. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/cross.bbclass |7 --- meta/conf/bitbake.conf | 15 ++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index f9fd07a..81358ec 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -38,11 +38,12 @@ DEPENDS_GETTEXT = gettext-native # Path mangling needed by the cross packaging # Note that we use := here to ensure that libdir and includedir are # target paths. -target_libdir := ${libdir} -target_includedir := ${includedir} -target_base_libdir := ${base_libdir} +target_base_prefix := ${base_prefix} target_prefix := ${prefix} target_exec_prefix := ${exec_prefix} +target_base_libdir = ${target_base_prefix}/${baselib} +target_libdir = ${target_exec_prefix}/${baselib} +target_includedir := ${includedir} # Overrides for paths CROSS_TARGET_SYS_DIR = ${MULTIMACH_TARGET_SYS} diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 975e24c..e768df5 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -1,6 +1,13 @@ ## # Standard target filesystem paths. ## +# +# If changing these values, beware that native/cross/nativesdk bbclass +# files may also need changes to keep in sync. +# + +# Used by multilib code to change the library paths +baselib = lib # Path prefixes export base_prefix = @@ -10,7 +17,7 @@ export exec_prefix = /usr # Base paths export base_bindir = ${base_prefix}/bin export base_sbindir = ${base_prefix}/sbin -export base_libdir = ${base_prefix}/lib +export base_libdir = ${base_prefix}/${baselib} # Architecture independent paths export datadir = ${prefix}/share @@ -26,13 +33,11 @@ export docdir = ${datadir}/doc export bindir = ${exec_prefix}/bin export sbindir = ${exec_prefix}/sbin export libexecdir = ${exec_prefix}/libexec -export libdir = ${exec_prefix}/lib +export libdir = ${exec_prefix}/${baselib} export includedir = ${exec_prefix}/include export oldincludedir = ${exec_prefix}/include -# -# These must match the various bbclass layout definitions -# +# Linkage between native/cross/nativesdk layouts base_bindir_native = /bin base_sbindir_native = /sbin sysconfdir_native = /etc -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] First round of tune config file updates
These patches set the scene for the multilib work. I'm posting these first as they're the more invasive changes to the variables the tune files currently expose and are likely the more user visible changes. The first patch allows multilib to be able to change /lib as needed dynamically to variants like /lib64. Reasons for doing it the way its been done are included in the commit message of the patch. The second two patches change the tune files to operate on TUNE* variables. This allows some cleanup and simplification of the core and creates a clear namespace for the tune files to operate under. It does mean that machine support files need to remove any explicit TARGET_ARCH setting and now should always include an appopriate tune file to ensure the TUNE variables are set correctly. Sanity checks have been added to ensure users are informed when this has not been done. These should be the only compatibility break multilib requires with the rest of the work involving changes to the tune file internals themselves. The changes are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rpurdie/ml-stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rpurdie/ml-stage Richard Purdie (3): bitbake.conf/cross.bbclass: Add ability to dynamically change library location conf/machine/tune: Overhaul tune include file variables conf/machine/include: Set TUNE_CCARGS instead of TARGET_CC_ARCH meta/classes/cross.bbclass |7 +++-- meta/classes/sanity.bbclass | 10 ++-- meta/conf/bitbake.conf | 26 ++--- meta/conf/machine/include/tune-arm1136jf-s.inc |9 --- meta/conf/machine/include/tune-arm920t.inc |7 +++-- meta/conf/machine/include/tune-arm926ejs.inc | 10 +--- meta/conf/machine/include/tune-arm9tdmi.inc |7 +++-- meta/conf/machine/include/tune-armv7.inc |7 +++-- meta/conf/machine/include/tune-atom.inc |6 +++- meta/conf/machine/include/tune-c3.inc|8 -- meta/conf/machine/include/tune-cortexa8.inc |7 +++-- meta/conf/machine/include/tune-cortexm1.inc |7 +++-- meta/conf/machine/include/tune-cortexm3.inc |7 +++-- meta/conf/machine/include/tune-cortexr4.inc |7 +++-- meta/conf/machine/include/tune-ep9312.inc|7 +++-- meta/conf/machine/include/tune-i586.inc |6 + meta/conf/machine/include/tune-iwmmxt.inc|7 +++-- meta/conf/machine/include/tune-mips32.inc|7 +++-- meta/conf/machine/include/tune-ppc603e.inc |7 +++-- meta/conf/machine/include/tune-ppce300c2.inc |6 +++- meta/conf/machine/include/tune-ppce500.inc |6 +++- meta/conf/machine/include/tune-ppce500mc.inc |7 +++-- meta/conf/machine/include/tune-ppce500v2.inc |7 +++-- meta/conf/machine/include/tune-sh3.inc |7 +++-- meta/conf/machine/include/tune-sh4.inc |7 +++-- meta/conf/machine/include/tune-strongarm1100.inc |6 - meta/conf/machine/include/tune-supersparc.inc|7 +++-- meta/conf/machine/include/tune-thumb.inc |2 +- meta/conf/machine/include/tune-x86_64.inc|5 meta/conf/machine/include/tune-xscale.inc| 10 meta/conf/machine/qemuarm.conf |2 - meta/conf/machine/qemumips.conf |2 - meta/conf/machine/qemuppc.conf |2 - meta/conf/machine/qemux86-64.conf|3 +- meta/conf/machine/qemux86.conf |4 +-- 35 files changed, 144 insertions(+), 98 deletions(-) create mode 100644 meta/conf/machine/include/tune-i586.inc create mode 100644 meta/conf/machine/include/tune-x86_64.inc -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] conf/machine/tune: Overhaul tune include file variables
There is currently consideradble confusion over how the tune files operate and how these interact with the rest of the build system. This update/overhaul changes things so the tune files are primarily resonsible for setting: TUNE_ARCH - What was formerly set as TARGET_ARCH and is the value that represents the architecture we're targetting. TUNE_PKGARCH - The value that represents the tune confuration that this set of tune parameters results in. This allows the significant improvement that the core can now always determine the target architecture value, even when TARGET_ARCH needs to be reset to something different and likewise, there is one package architecture variable the core can reference allowing simplification of the BASE_PACKAGE_ARCH, PACKAGE_ARCH and FEED_ARCH variables. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/sanity.bbclass | 10 +++--- meta/conf/bitbake.conf |7 --- meta/conf/machine/include/tune-arm1136jf-s.inc |5 +++-- meta/conf/machine/include/tune-arm920t.inc |5 +++-- meta/conf/machine/include/tune-arm926ejs.inc |6 -- meta/conf/machine/include/tune-arm9tdmi.inc |5 +++-- meta/conf/machine/include/tune-armv7.inc |5 +++-- meta/conf/machine/include/tune-atom.inc |4 +++- meta/conf/machine/include/tune-c3.inc|6 -- meta/conf/machine/include/tune-cortexa8.inc |5 +++-- meta/conf/machine/include/tune-cortexm1.inc |5 +++-- meta/conf/machine/include/tune-cortexm3.inc |5 +++-- meta/conf/machine/include/tune-cortexr4.inc |5 +++-- meta/conf/machine/include/tune-ep9312.inc|5 +++-- meta/conf/machine/include/tune-i586.inc |6 ++ meta/conf/machine/include/tune-iwmmxt.inc|5 +++-- meta/conf/machine/include/tune-mips32.inc|5 +++-- meta/conf/machine/include/tune-ppc603e.inc |5 +++-- meta/conf/machine/include/tune-ppce300c2.inc |4 +++- meta/conf/machine/include/tune-ppce500.inc |4 +++- meta/conf/machine/include/tune-ppce500mc.inc |5 +++-- meta/conf/machine/include/tune-ppce500v2.inc |5 +++-- meta/conf/machine/include/tune-sh3.inc |5 +++-- meta/conf/machine/include/tune-sh4.inc |5 +++-- meta/conf/machine/include/tune-strongarm1100.inc |4 meta/conf/machine/include/tune-supersparc.inc|5 +++-- meta/conf/machine/include/tune-x86_64.inc|5 + meta/conf/machine/include/tune-xscale.inc|4 ++-- meta/conf/machine/qemuarm.conf |2 -- meta/conf/machine/qemumips.conf |2 -- meta/conf/machine/qemuppc.conf |2 -- meta/conf/machine/qemux86-64.conf|3 +-- meta/conf/machine/qemux86.conf |4 +--- 33 files changed, 98 insertions(+), 60 deletions(-) create mode 100644 meta/conf/machine/include/tune-i586.inc create mode 100644 meta/conf/machine/include/tune-x86_64.inc diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index acda1a9..b054146 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -147,9 +147,13 @@ def check_sanity(e): if (LooseVersion(__version__) LooseVersion(minversion)): messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, __version__) -# Check TARGET_ARCH is set -if data.getVar('TARGET_ARCH', e.data, True) == 'INVALID': -messages = messages + 'Please set TARGET_ARCH directly, or choose a MACHINE or DISTRO that does so.\n' +# Check TUNE_ARCH is set +if data.getVar('TUNE_ARCH', e.data, True) == 'INVALID': +messages = messages + 'TUNE_ARCH is unset. Please ensure your MACHINE configuration includes a valid tune configuration file which will set this correctly.\n' + +# Check TARGET_ARCH is set correctly +if data.getVar('TARGE_ARCH', e.data, False) == '${TUNE_ARCH}': +messages = messages + 'TARGET_ARCH is being overwritten, likely by your MACHINE configuration files.\nPlease use a valid tune configuration file which should set this correctly automatically\nand avoid setting this in the machine configuration. See the OE-Core mailing list for more information.\n' # Check TARGET_OS is set if data.getVar('TARGET_OS', e.data, True) == 'INVALID': diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index e768df5..f95343f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -81,7 +81,8 @@ HOST_PREFIX = ${TARGET_PREFIX} HOST_CC_ARCH = ${TARGET_CC_ARCH} HOST_EXEEXT = -TARGET_ARCH = INVALID +TUNE_ARCH ??= INVALID +TARGET_ARCH = ${TUNE_ARCH} TARGET_OS = INVALID TARGET_VENDOR = -oe TARGET_SYS = ${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == (''
Re: [OE-core] [PATCH 3/3] conf/machine/include: Set TUNE_CCARGS instead of TARGET_CC_ARCH
Op 22 jul. 2011, om 16:49 heeft Richard Purdie het volgende geschreven: Since we're updating the tune file format, it makes sense to abstract the compiler tune arguments at this point too. This means that should these need to be overridden at any point, the original values can still be obtained in a similar manner to the other TUNE* variables. Whilst this isn't strictly necessary for any current need, its likely good practise to standardise this behaviour. So if I'm reading the patch correctly this doesn't result in a behaviour change, it just shuffles the definitions around in preparation for Mark's tune overhaul. regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] conf/machine/include: Set TUNE_CCARGS instead of TARGET_CC_ARCH
Since we're updating the tune file format, it makes sense to abstract the compiler tune arguments at this point too. This means that should these need to be overridden at any point, the original values can still be obtained in a similar manner to the other TUNE* variables. Whilst this isn't strictly necessary for any current need, its likely good practise to standardise this behaviour. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/conf/bitbake.conf |4 +++- meta/conf/machine/include/tune-arm1136jf-s.inc |4 ++-- meta/conf/machine/include/tune-arm920t.inc |2 +- meta/conf/machine/include/tune-arm926ejs.inc |4 ++-- meta/conf/machine/include/tune-arm9tdmi.inc |2 +- meta/conf/machine/include/tune-armv7.inc |2 +- meta/conf/machine/include/tune-atom.inc |2 +- meta/conf/machine/include/tune-c3.inc|2 +- meta/conf/machine/include/tune-cortexa8.inc |2 +- meta/conf/machine/include/tune-cortexm1.inc |2 +- meta/conf/machine/include/tune-cortexm3.inc |2 +- meta/conf/machine/include/tune-cortexr4.inc |2 +- meta/conf/machine/include/tune-ep9312.inc|2 +- meta/conf/machine/include/tune-i586.inc |2 +- meta/conf/machine/include/tune-iwmmxt.inc|2 +- meta/conf/machine/include/tune-mips32.inc|2 +- meta/conf/machine/include/tune-ppc603e.inc |2 +- meta/conf/machine/include/tune-ppce300c2.inc |2 +- meta/conf/machine/include/tune-ppce500.inc |2 +- meta/conf/machine/include/tune-ppce500mc.inc |2 +- meta/conf/machine/include/tune-ppce500v2.inc |2 +- meta/conf/machine/include/tune-sh3.inc |2 +- meta/conf/machine/include/tune-sh4.inc |2 +- meta/conf/machine/include/tune-strongarm1100.inc |2 +- meta/conf/machine/include/tune-supersparc.inc|2 +- meta/conf/machine/include/tune-thumb.inc |2 +- meta/conf/machine/include/tune-x86_64.inc|2 +- meta/conf/machine/include/tune-xscale.inc|6 +++--- 28 files changed, 34 insertions(+), 32 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f95343f..2954faa 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -82,12 +82,14 @@ HOST_CC_ARCH = ${TARGET_CC_ARCH} HOST_EXEEXT = TUNE_ARCH ??= INVALID +TUNE_CCARGS ??= + TARGET_ARCH = ${TUNE_ARCH} TARGET_OS = INVALID TARGET_VENDOR = -oe TARGET_SYS = ${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} TARGET_PREFIX = ${TARGET_SYS}- -TARGET_CC_ARCH = +TARGET_CC_ARCH = ${TUNE_CCARGS} SDK_ARCH = ${BUILD_ARCH} SDK_OS = ${BUILD_OS} diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc index bc90924..c1d0c07 100644 --- a/meta/conf/machine/include/tune-arm1136jf-s.inc +++ b/meta/conf/machine/include/tune-arm1136jf-s.inc @@ -1,7 +1,7 @@ TUNE_ARCH = arm -TARGET_CC_ARCH = -march=armv6j -mtune=arm1136jf-s -TARGET_CC_ARCH += ${@['', '-mfloat-abi=softfp -mfpu=vfp'][(bb.data.getVar('TARGET_FPU', d, 1) == 'soft') and (bb.data.getVar('CPU_FEATURES', d, 1).find('vfp') != -1)]} +TUNE_CCARGS = -march=armv6j -mtune=arm1136jf-s +TUNE_CCARGS += ${@['', '-mfloat-abi=softfp -mfpu=vfp'][(bb.data.getVar('TARGET_FPU', d, 1) == 'soft') and (bb.data.getVar('CPU_FEATURES', d, 1).find('vfp') != -1)]} TUNE_PKGARCH = armv6 ARM_INSTRUCTION_SET = ${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]} diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc index 2991e85..3f30e2a 100644 --- a/meta/conf/machine/include/tune-arm920t.inc +++ b/meta/conf/machine/include/tune-arm920t.inc @@ -1,5 +1,5 @@ TUNE_ARCH = arm TUNE_PKGARCH = armv4t -TARGET_CC_ARCH = -march=armv4t -mtune=arm920t +TUNE_CCARGS = -march=armv4t -mtune=arm920t PACKAGE_EXTRA_ARCHS = arm armv4 armv4t diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc index e54403b..049f57c 100644 --- a/meta/conf/machine/include/tune-arm926ejs.inc +++ b/meta/conf/machine/include/tune-arm926ejs.inc @@ -3,7 +3,7 @@ TUNE_ARCH = arm TUNE_PKGARCH = armv5te PACKAGE_EXTRA_ARCHS = arm armv4 armv4t armv5te # For gcc 3.x you need: -#TARGET_CC_ARCH = -march=armv5te -mtune=arm926ejs +#TUNE_CCARGS = -march=armv5te -mtune=arm926ejs # For gcc 4.x you need: -TARGET_CC_ARCH = -march=armv5te -mtune=arm926ej-s +TUNE_CCARGS = -march=armv5te -mtune=arm926ej-s diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc index b75de3d..0ed2f40 100644 --- a/meta/conf/machine/include/tune-arm9tdmi.inc +++ b/meta/conf/machine/include/tune-arm9tdmi.inc @@ -2,4 +2,4 @@ TUNE_ARCH = arm TUNE_PKGARCH = armv4t PACKAGE_EXTRA_ARCHS = arm
Re: [OE-core] [PATCH 0/5] Add support for powerpc64
On Jul 22, 2011, at 9:19 AM, Tom Rini wrote: On 07/22/2011 02:24 AM, Kumar Gala wrote: Add various cleanups to core scripts and packages that are needed for building for a 64-bit powerpc target. Everything looks fine here, added my Ack's for bits I recall doing too :) Yeah, probably duplicated a bit of work there ;) - k ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] conf/machine/tune: Overhaul tune include file variables
On Jul 22, 2011, at 9:49 AM, Richard Purdie wrote: There is currently consideradble confusion over how the tune files operate and how these interact with the rest of the build system. This update/overhaul changes things so the tune files are primarily resonsible for setting: TUNE_ARCH - What was formerly set as TARGET_ARCH and is the value that represents the architecture we're targetting. TUNE_PKGARCH - The value that represents the tune confuration that this set of tune parameters results in. This allows the significant improvement that the core can now always determine the target architecture value, even when TARGET_ARCH needs to be reset to something different and likewise, there is one package architecture variable the core can reference allowing simplification of the BASE_PACKAGE_ARCH, PACKAGE_ARCH and FEED_ARCH variables. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- Can you give an example of how this will work for multilib? - k ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] conf/machine/include: Set TUNE_CCARGS instead of TARGET_CC_ARCH
On Fri, 2011-07-22 at 16:54 +0200, Koen Kooi wrote: Op 22 jul. 2011, om 16:49 heeft Richard Purdie het volgende geschreven: Since we're updating the tune file format, it makes sense to abstract the compiler tune arguments at this point too. This means that should these need to be overridden at any point, the original values can still be obtained in a similar manner to the other TUNE* variables. Whilst this isn't strictly necessary for any current need, its likely good practise to standardise this behaviour. So if I'm reading the patch correctly this doesn't result in a behaviour change, it just shuffles the definitions around in preparation for Mark's tune overhaul. Yes. I'm trying to split the work Mark and I have done into logical chunks we can review and these are the pieces to setup the externally facing variables we need. I've not yet finished the patches which change the tune files themselves but we have a pretty good idea of what the finished result needs to look like to get all this working which we have experimented and tested with. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] conf/machine/tune: Overhaul tune include file variables
On Fri, 2011-07-22 at 10:03 -0500, Kumar Gala wrote: On Jul 22, 2011, at 9:49 AM, Richard Purdie wrote: There is currently consideradble confusion over how the tune files operate and how these interact with the rest of the build system. This update/overhaul changes things so the tune files are primarily resonsible for setting: TUNE_ARCH - What was formerly set as TARGET_ARCH and is the value that represents the architecture we're targetting. TUNE_PKGARCH - The value that represents the tune confuration that this set of tune parameters results in. This allows the significant improvement that the core can now always determine the target architecture value, even when TARGET_ARCH needs to be reset to something different and likewise, there is one package architecture variable the core can reference allowing simplification of the BASE_PACKAGE_ARCH, PACKAGE_ARCH and FEED_ARCH variables. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- Can you give an example of how this will work for multilib? These are setting the scene for multilib, it doesn't directly enable it. For an example of the end result see this branch: http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mhatle/oe-core/ml but this isn't in a form suitable for submission yet which is what I'm working towards. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] conf/machine/include: Set TUNE_CCARGS instead of TARGET_CC_ARCH
Op 22 jul. 2011, om 17:11 heeft Richard Purdie het volgende geschreven: On Fri, 2011-07-22 at 16:54 +0200, Koen Kooi wrote: Op 22 jul. 2011, om 16:49 heeft Richard Purdie het volgende geschreven: Since we're updating the tune file format, it makes sense to abstract the compiler tune arguments at this point too. This means that should these need to be overridden at any point, the original values can still be obtained in a similar manner to the other TUNE* variables. Whilst this isn't strictly necessary for any current need, its likely good practise to standardise this behaviour. So if I'm reading the patch correctly this doesn't result in a behaviour change, it just shuffles the definitions around in preparation for Mark's tune overhaul. Yes. I'm trying to split the work Mark and I have done into logical chunks we can review and these are the pieces to setup the externally facing variables we need. I've not yet finished the patches which change the tune files themselves but we have a pretty good idea of what the finished result needs to look like to get all this working which we have experimented and tested with. After some changes to meta-ti to move aside the tune files in there 'bitbake -e' is functionally the same. So for arm926 and cortexa8: Tested-by: Koen Kooi k...@dominion.thruhere.net regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] Fix building in very long paths
On 07/20/2011 01:08 PM, Tom Rini wrote: Hey all, The following series fixes building in deep paths. To be clear, the biggest problem is that shebang (#!) is not portable over 80 chars in length and we already eat up 51 chars with sysroot paths on x86_64. The fix, in concept is easy, use /usr/bin/env instead. In practice, perl makes this difficult. In this series we fix python to use /usr/bin/env, add a 'nativeperl' wrapper (RP's name) so that we can do /usr/bin/env nativeperl and not require sub-recipes to have inherit perlnative (eg sato-icon-theme would need perlnative if we didn't do this). Next we have cpan make sure it mangles everything to use nativeperl and then go fix a few hard cases by hand. All of these changes are either direct ports (python) or port + more work (perl/cpan) of changes I did in oe.dev. With this series I'm able to build world for qemux86 in a very long path (which means I could then turn on doing this in our jenkins cluster on the weekend like I did for oe.dev on testing-next). The following changes since commit 0d03800caffc2341b74190d38f7a372223c89f4c: Mei Lei (1): lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib trini/work-in-deep-paths-v1 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/work-in-deep-paths-v1 Tom Rini (5): python-native: Mangle scripts to use /usr/bin/env python, bump PR gnome-doc-utils: Use /usr/bin/env python in xml2po, bump PR perl-native: Add a perl-native wrapper in the normal bindir cpan.bbclass: Perform more mangling for perl path icon-naming-utils-native: Fix long path to perl in icon-name-mapping meta/classes/cpan.bbclass |3 ++ .../icon-naming-utils-native_0.8.7.bb |7 +++- meta/recipes-devtools/perl/liburi-perl_1.58.bb |2 +- .../perl/libxml-parser-perl_2.40.bb|2 +- meta/recipes-devtools/perl/libxml-perl_0.08.bb |2 +- .../perl/libxml-simple-perl_2.18.bb|2 +- meta/recipes-devtools/perl/perl-native_5.12.3.bb | 17 +- .../recipes-devtools/python/python-native_2.6.6.bb |5 +++ .../sgmlspl/sgmlspl-native_1.03ii.bb |2 +- .../perl/libconvert-asn1-perl_0.22.bb |2 +- .../recipes-extended/perl/libtimedate-perl_1.20.bb |2 +- .../perl/libxml-namespacesupport-perl_1.11.bb |2 +- meta/recipes-extended/perl/libxml-sax-perl_0.96.bb |2 +- .../use-usr-bin-env-for-python-in-xml2po.patch | 33 meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |5 ++- 15 files changed, 75 insertions(+), 13 deletions(-) create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/use-usr-bin-env-for-python-in-xml2po.patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core Merged into oe-core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 0/1] Resync siteinfo.bbclass with oe.dev
On 07/20/2011 01:50 PM, Tom Rini wrote: Hey all, This is the second of two pull requests. This doesn't depend on the first request, it's just splitting changes up. There's three changes here. First, site/ix86-common was setting the wrong value for unsigned int. Second, change perl to use SITEINFO variables rather than functions. We're down to one change now to re-sync siteinfo.bbclass with oe-core and oe.dev. This re-works the functions a bit inside siteinfo.bbclass to be easier to add new platforms (and hopefully multilibs) to. My next step is to work on merging and verifying as much as possible the site files in oe-core and oe.dev. v2: Rework based on Richard's comments to not be a generator and just return a string list again. The following changes since commit 0d03800caffc2341b74190d38f7a372223c89f4c: Mei Lei (1): lsbsetup_1.0.bb: Change the hardcoded /usr/lib to support multilib are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib trini/update-siteinfo-bbclass-v2 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/update-siteinfo-bbclass-v2 Tom Rini (1): siteinfo.bbclass: Port over oe.dev logic for site files meta/classes/siteinfo.bbclass | 203 - 1 files changed, 98 insertions(+), 105 deletions(-) create mode 100644 meta/site/common-linux ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core Merged into Oe-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/6] mesa-xlib, mesa-dri: Probe for newlocale() before using it.
On 07/20/2011 11:10 PM, Khem Raj wrote: Signed-off-by: Khem Rajraj.k...@gmail.com --- meta/recipes-graphics/mesa/mesa-dri/uclibc.patch | 40 ++ meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb|6 ++- meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb |5 ++- 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-graphics/mesa/mesa-dri/uclibc.patch diff --git a/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch b/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch new file mode 100644 index 000..bb5af44 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch @@ -0,0 +1,40 @@ +Index: Mesa-7.10.2/src/mesa/main/imports.c +=== +--- Mesa-7.10.2.orig/src/mesa/main/imports.c 2011-03-01 12:57:29.0 -0800 Mesa-7.10.2/src/mesa/main/imports.c2011-07-20 19:08:49.441785510 -0700 +@@ -757,7 +757,7 @@ + float + _mesa_strtof( const char *s, char **end ) + { +-#if defined(_GNU_SOURCE) !defined(__CYGWIN__) !defined(__FreeBSD__) ++#if defined(_GNU_SOURCE) !defined(__CYGWIN__) !defined(__FreeBSD__) defined (HAVE_NEWLOCALE) +static locale_t loc = NULL; +if (!loc) { + loc = newlocale(LC_CTYPE_MASK, C, NULL); +Index: Mesa-7.10.2/src/glsl/strtod.c +=== +--- Mesa-7.10.2.orig/src/glsl/strtod.c 2011-01-03 16:45:51.0 -0800 Mesa-7.10.2/src/glsl/strtod.c 2011-07-20 19:10:21.441785488 -0700 +@@ -44,7 +44,7 @@ + double + glsl_strtod(const char *s, char **end) + { +-#if defined(_GNU_SOURCE) !defined(__CYGWIN__) !defined(__FreeBSD__) ++#if defined(_GNU_SOURCE) !defined(__CYGWIN__) !defined(__FreeBSD__) defined (HAVE_NEWLOCALE) +static locale_t loc = NULL; +if (!loc) { + loc = newlocale(LC_CTYPE_MASK, C, NULL); +Index: Mesa-7.10.2/configure.ac +=== +--- Mesa-7.10.2.orig/configure.ac 2011-07-20 19:09:02.0 -0700 Mesa-7.10.2/configure.ac 2011-07-20 19:09:57.121785492 -0700 +@@ -450,6 +450,9 @@ + dnl See if posix_memalign is available + AC_CHECK_FUNC([posix_memalign], [DEFINES=$DEFINES -DHAVE_POSIX_MEMALIGN]) + ++dnl See if newlocale is available ++AC_CHECK_FUNCS_ONCE(newlocale) ++ + dnl SELinux awareness. + AC_ARG_ENABLE([selinux], + [AS_HELP_STRING([--enable-selinux], diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb index c7bd974..aac7a1c 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb @@ -8,10 +8,12 @@ LIB_DEPS = libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat DEPENDS = ${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native -PR = r0 +PR = r1 SRC_URI = ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ - file://crossfix.patch + file://crossfix.patch \ + file://uclibc.patch \ + SRC_URI[md5sum] = f5de82852f1243f42cc004039e10b771 SRC_URI[sha256sum] = 8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1 diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb index b77df2c..511103d 100644 --- a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb +++ b/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb @@ -1,6 +1,9 @@ include mesa-common.inc +FILESPATH =. ${FILE_DIRNAME}/mesa-dri: + SRC_URI = ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ + file://uclibc.patch \ SRC_URI[md5sum] = f5de82852f1243f42cc004039e10b771 @@ -14,6 +17,6 @@ LIB_DEPS = virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ DEPENDS = ${PROTO_DEPS} ${LIB_DEPS} makedepend-native PE = 1 -PR = r0 +PR = r1 EXTRA_OECONF += --with-driver=xlib The series was merged into OE-Core aside from the libiconv, which I believe is getting re-worked. Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] kernel: consolidated pull request
On 07/21/2011 10:16 AM, Bruce Ashfield wrote: Richard/Saul, What follows is a set of kernel changes that have been brewing for a while now: 294170 kern-tools: update SRCREV 65d8b50 linux-yocto: update LICENSE to GPLv2 069e9d9 kernel: copy defconfig to {B} vs {S} 6796e11 linux-yocto: kernel-3.0 support recipe The patches are pretty self explanitory, but a few comments follow. The kern-tools tweak Fixes [YOCTO #1261], which allows both the 2.6.34 and 3.0 based -rt kernels to build again. The next two changes are small cleanups and a allow linux-yocto to inherit changes to the base kernel class' do_configure(). And finally, we create the 3.0 base recipe. A few notes about this are: - it is a carry forward of the immediately available 2.6.37 (and before) functionality - it has an audit and cleanup of the config fragments, which was one of the 1.1 deliverables - it has been built for all core arches, and (attempted) boot tested on them as well. - it is not the default for any target at the moment, this needs more testing, and there are two known issues I'm tracking a qemumips boot failure that snuck in during the 3.0 -rc cycle (it did boot) and qemuppc interrupts being lost. I'll update the preferred versions as targets are validated. - I've built and booted the core-images on them, but functionality like graphics, etc, still needs to be tested. There's only so much I can do :) - the -rt branch is populated with tglx's recent update of -rt! - separate patches will go out for other layers (meta-kernel-dev, meta-rt, meta-yocto, etc) shortly. ** This obviously builds on the other hard work done to get userspace and tools ready for the 3.0 kernel version change. Many thanks for that, since it allowed me to focus on the kernel only. Patches are welcome for any misbehaving boards or qemu targets : cc: Darren Hartdvh...@linux.intel.com cc: Tom Zanussitom.zanu...@intel.com The following changes since commit 1df5ab5ee285b3220348ce0cf371b81446d55832: parse/ConfHandler: Fix multiline variable corruption (2011-07-21 11:09:47 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (4): linux-yocto: kernel-3.0 support recipe kernel: copy defconfig to {B} vs {S} linux-yocto: update LICENSE to GPLv2 kern-tools: update SRCREV meta/classes/kernel-yocto.bbclass |6 --- meta/classes/kernel.bbclass|4 +- .../kern-tools/kern-tools-native_git.bb|2 +- meta/recipes-kernel/linux/linux-yocto.inc |2 +- meta/recipes-kernel/linux/linux-yocto_3.0.bb | 47 5 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 meta/recipes-kernel/linux/linux-yocto_3.0.bb Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [patch]oe-init-build-env: Find and use python2 as default python
On 07/20/2011 11:26 PM, NiQingliang wrote: thanks your guide, I have read the link, but it looks like only show the rule with result without generating process. my mean is how to generate one patch. setp 1 ... step 2 ... step3 ... Ni (sorry about getting your name wrong last time) Everyone's work flow is different, I am not sure what your currently is, but using git format-patch and git send-email would be the best method to send a patch that can then be consumed by git am. Please resend this as I still had trouble with the merge. Thanks Sau! so after made other patch mail as reference, I got that (`git diff -p --stat` after a new clean clone) (and sorry for that if still mistake): oe-init-build-env: Find and use python2 as default python most Linux distribution use python 2.x as the default as bitbake expected, but some use python 3.x as the default (like archlinux). if the default python is 2.x, it will do nothing. or it will search it in /usr/bin and /bin. if found, then make a soft link in the build dir, and add the build dir into the env var PATH. Signed-off-by: Ni Qingliangniqingli...@insigma.com.cn --- oe-init-build-env | 28 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/oe-init-build-env b/oe-init-build-env index 77332a7..a11a4c4 100755 --- a/oe-init-build-env +++ b/oe-init-build-env @@ -39,6 +39,34 @@ else $OEROOT/scripts/oe-setup-builddir unset OEROOT unset BBPATH + + # find the python 2.x, if the default python is not. + # NOTE: + #the 'python -V' need redirect to stdout + #once we can ensure every distribution has 'python2' (currently, except + #ubuntu), we should change bitbake's shebang to '/usr/bin/env python2', + #and remove this patch. + # precondition: + #$BUILDDIR is not NULL, but I doubt when it will be NULL. + #user have not made the file $BUILDDIR/python by himself. + if [ -z `/usr/bin/env python -V 21|grep '^Python 2\.'` ]; then + PYTHON2_BIN= + for PY_BIN in `find /{usr/,}bin -regex '.*/python\(\|2\|2\.[0-9]* \)'`; do + if [ -n `$PY_BIN -V 21|grep '^Python 2\.'` ]; then +PYTHON2_BIN=$PY_BIN +break + fi + done + if [ -n $PYTHON2_BIN ]; then + ln -sf $PY_BIN $BUILDDIR/python + export PATH=$BUILDDIR:$PATH + echo NOTE: BitBake will use '$PY_BIN' to execute python code. + else + echo ERROR: unable to find Python 2.x, BitBake requires Python 2.6 or 2.7. + fi + unset PYTHON2_BIN + fi + [ -n $BUILDDIR ] cd $BUILDDIR fi On Thu, 2011-07-21 at 05:28 +0800, Saul Wold wrote: oe-init-build-env: Find and use python2 as default python ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] tclibc-uclibc: Fix TARGET_OS for powerpc
On 07/21/2011 08:18 PM, Khem Raj wrote: 1a9ae8ea8c0540d41b8ff4d95c0420d6df754634 removed -uclibc hence it got all wrong for powerpc. uclibc TARGET_OS for classic ppc is linux-uclibc and for ppc w/ SPE its linux-uclibcspe Signed-off-by: Khem Rajraj.k...@gmail.com --- meta/conf/distro/include/tclibc-uclibc.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc index 2ccda5b..7c06654 100644 --- a/meta/conf/distro/include/tclibc-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -5,7 +5,7 @@ TARGET_OS = linux-uclibc TARGET_OS_arm = linux-uclibceabi TARGET_OS_armeb = linux-uclibceabi -TARGET_OS_powerpc = linux${@['','-gnuspe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]} +TARGET_OS_powerpc = linux-uclibc${@['','spe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]} # Add uclibc overrides to the overrides. OVERRIDES =. libc-uclibc: Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8] x86_64-linux siteinfo: Add bash info
Taken from oe.dev Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/site/x86_64-linux |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/meta/site/x86_64-linux b/meta/site/x86_64-linux index ba6e57c..076e5b6 100644 --- a/meta/site/x86_64-linux +++ b/meta/site/x86_64-linux @@ -89,6 +89,11 @@ ac_cv_lib_m_sin=${ac_cv_lib_m_sin=yes} #orbit libIDL_cv_long_long_format=ll + +# bash +bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present} + +# ORBit2 ac_cv_alignof_CORBA_boolean=1 ac_cv_alignof_CORBA_char=1 ac_cv_alignof_CORBA_double=8 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/8] Start consolidating siteinfo information
Hey all, As I've been talking about for a while, here is the first part of re-syncing oe.dev siteinfo files with oe-core AND doing more consolidation. There's more to do, but I don't want this to grow too large before I start submitting. This contains what I would call the obviously correct stuff where: - all of the common platforms set things to the same value - A little poking around shows it's a libc test or a standard linux feature. - All of the arches that didn't set it just hadn't tried to build that yet. The only part that's not 100% in that would be the db mutex drops. But after trying the version of db we have and looking at the recipe: - These values weren't being used at all and were incorrect in some cases anyhow (eg x86_64 uclibc went with the x86_64 asm bits it has for mutex, not none) - It's not how you set mutex bits either. ie arm was doing one thing in siteinfo and the recipe another and the way the recipe did it, works. The following changes since commit b4c23fce3eadaff8fc621d38759d493cd03cc131: Koen Kooi (1): consolekit 0.4.5: fix PAM installation dir are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib trini/update-site-files-22jul http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/update-site-files-22jul Tom Rini (8): siteinfo: Move certain samba entries to common-linux siteinfo: Move certain bash entries to common-linux x86_64-linux siteinfo: Add bash info siteinfo: Move certain mysql entries to common-linux siteinfo: Move the rp-pppoe entry to common-linux siteinfo: Move certain db entries to common-linux siteinfo: Move general realloc/malloc values to common-$libc siteinfo: Move (getpgrp|setpgrp|setgrent|*get{pwuid,grgid}) to common-libc meta/site/arm-common | 35 - meta/site/arm-linux | 14 -- meta/site/arm-linux-uclibc| 11 -- meta/site/armeb-linux | 10 -- meta/site/armeb-linux-uclibc | 10 -- meta/site/common-glibc| 10 ++ meta/site/common-linux| 39 ++ meta/site/common-uclibc | 11 ++ meta/site/ix86-common | 43 -- meta/site/mips-common |3 - meta/site/mips-linux | 29 + meta/site/mips-linux-uclibc | 29 + meta/site/mipsel-linux| 40 +-- meta/site/mipsel-linux-uclibc | 26 meta/site/powerpc-common | 285 + meta/site/powerpc-linux | 13 -- meta/site/powerpc32-linux | 36 +- meta/site/sh-common | 45 +--- meta/site/sparc-linux | 10 -- meta/site/x86_64-linux| 28 +--- meta/site/x86_64-linux-uclibc | 23 21 files changed, 357 insertions(+), 393 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/8] siteinfo: Move (getpgrp|setpgrp|setgrent|*get{pwuid, grgid}) to common-libc
These functions are determined by the C library so move them to common-glibc and common-uclibc Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/site/arm-common |4 meta/site/arm-linux |5 - meta/site/arm-linux-uclibc|5 - meta/site/armeb-linux |5 - meta/site/armeb-linux-uclibc |5 - meta/site/common-glibc|7 +++ meta/site/common-uclibc |7 +++ meta/site/ix86-common |6 -- meta/site/mips-linux |6 -- meta/site/mips-linux-uclibc |6 -- meta/site/mipsel-linux|6 -- meta/site/mipsel-linux-uclibc |4 meta/site/powerpc-common |6 -- meta/site/powerpc-linux |6 -- meta/site/sh-common |4 meta/site/sparc-linux |4 meta/site/x86_64-linux|6 -- meta/site/x86_64-linux-uclibc |5 - 18 files changed, 14 insertions(+), 83 deletions(-) diff --git a/meta/site/arm-common b/meta/site/arm-common index c216b57..04d1164 100644 --- a/meta/site/arm-common +++ b/meta/site/arm-common @@ -48,9 +48,6 @@ ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes} # gettext am_cv_func_working_getline=${am_cv_func_working_getline=yes} -# gio -ac_cv_func_getgrgid_r=${ac_cv_func_getgrgid_r=yes} - # glib glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} @@ -67,7 +64,6 @@ glib_cv_va_copy=${glib_cv_va_copy=yes} glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} glib_cv___va_copy=${glib_cv___va_copy=yes} glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no} -ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} glib_cv_sys_pthread_mutex_trylock_posix=${glib_cv_sys_pthread_mutex_trylock_posix=yes} glib_cv_sys_pthread_getspecific_posix=${glib_cv_sys_pthread_getspecific_posix=yes} glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_posix=yes} diff --git a/meta/site/arm-linux b/meta/site/arm-linux index 69d251d..762d489 100644 --- a/meta/site/arm-linux +++ b/meta/site/arm-linux @@ -1,8 +1,3 @@ -ac_cv_func_getpgrp_void=yes -ac_cv_func_setpgrp_void=yes -ac_cv_func_setgrent_void=yes -ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} -ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} ac_cv_sizeof_char=${ac_cv_sizeof_char=1} diff --git a/meta/site/arm-linux-uclibc b/meta/site/arm-linux-uclibc index 1e283ef..c5c430c 100644 --- a/meta/site/arm-linux-uclibc +++ b/meta/site/arm-linux-uclibc @@ -1,8 +1,3 @@ -ac_cv_func_getpgrp_void=yes -ac_cv_func_setpgrp_void=yes -ac_cv_func_setgrent_void=yes -ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} -ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} ac_cv_sizeof_char=${ac_cv_sizeof_char=1} diff --git a/meta/site/armeb-linux b/meta/site/armeb-linux index ecff3da..6521ff5 100644 --- a/meta/site/armeb-linux +++ b/meta/site/armeb-linux @@ -1,8 +1,3 @@ -ac_cv_func_getpgrp_void=yes -ac_cv_func_setpgrp_void=yes -ac_cv_func_setgrent_void=yes -ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} -ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} ac_cv_sizeof_char=${ac_cv_sizeof_char=1} diff --git a/meta/site/armeb-linux-uclibc b/meta/site/armeb-linux-uclibc index 8365810..731e857 100644 --- a/meta/site/armeb-linux-uclibc +++ b/meta/site/armeb-linux-uclibc @@ -1,8 +1,3 @@ -ac_cv_func_getpgrp_void=yes -ac_cv_func_setpgrp_void=yes -ac_cv_func_setgrent_void=yes -ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} -ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} ac_cv_sizeof_char=${ac_cv_sizeof_char=1} diff --git a/meta/site/common-glibc b/meta/site/common-glibc index 9339655..8cfa695 100644 --- a/meta/site/common-glibc +++ b/meta/site/common-glibc @@ -5,6 +5,13 @@ ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes} +ac_cv_func_getpgrp_void=yes +ac_cv_func_setpgrp_void=yes +ac_cv_func_setgrent_void=yes +ac_cv_func_getgrgid_r=${ac_cv_func_getgrgid_r=yes} +ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} +ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} +ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_type_uid_t={ac_cv_type_uid_t=yes} # bash diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc index 8ea192c..093f60e 100644 --- a/meta/site/common-uclibc +++ b/meta/site/common-uclibc @@ -4,6 +4,13 @@
[OE-core] [PATCH 1/8] siteinfo: Move certain samba entries to common-linux
Part of re-syncing with oe.dev, move samba_cv_HAVE_IFACE_* to common-linux Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/site/arm-linux |3 - meta/site/arm-linux-uclibc|3 - meta/site/armeb-linux |2 - meta/site/armeb-linux-uclibc |2 - meta/site/common-linux|5 + meta/site/mipsel-linux-uclibc |3 - meta/site/powerpc-common | 325 + meta/site/powerpc32-linux |3 - meta/site/sh-common |2 - 9 files changed, 330 insertions(+), 18 deletions(-) diff --git a/meta/site/arm-linux b/meta/site/arm-linux index 033366a..4dd4132 100644 --- a/meta/site/arm-linux +++ b/meta/site/arm-linux @@ -60,8 +60,6 @@ samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes} samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes} samba_cv_HAVE_FUNCTION_MACRO=${samba_cv_HAVE_FUNCTION_MACRO=yes} samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes} -samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no} -samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no} samba_cv_HAVE_INT16_FROM_RPC_RPC_H=${samba_cv_HAVE_INT16_FROM_RPC_RPC_H=no} samba_cv_HAVE_INT32_FROM_RPC_RPC_H=${samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no} @@ -145,7 +143,6 @@ samba_cv_unixsocket=${samba_cv_unixsocket=yes} samba_cv_volatile=${samba_cv_volatile=yes} #older sambe defines -samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes} samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes} samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes} samba_cv_USE_SETUIDX=${samba_cv_USE_SETUIDX=yes} diff --git a/meta/site/arm-linux-uclibc b/meta/site/arm-linux-uclibc index 2933c3f..5f8ba34 100644 --- a/meta/site/arm-linux-uclibc +++ b/meta/site/arm-linux-uclibc @@ -44,12 +44,9 @@ samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes} samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes} samba_cv_HAVE_FUNCTION_MACRO=${samba_cv_HAVE_FUNCTION_MACRO=yes} samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes} -samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no} -samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no} samba_cv_HAVE_INT16_FROM_RPC_RPC_H=${samba_cv_HAVE_INT16_FROM_RPC_RPC_H=no} samba_cv_HAVE_INT32_FROM_RPC_RPC_H=${samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no} -samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no} samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes} samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no} samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes} diff --git a/meta/site/armeb-linux b/meta/site/armeb-linux index c852f00..d8da123 100644 --- a/meta/site/armeb-linux +++ b/meta/site/armeb-linux @@ -31,8 +31,6 @@ ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} # samba samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes} -samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} -samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes} samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes} samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes} samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes} diff --git a/meta/site/armeb-linux-uclibc b/meta/site/armeb-linux-uclibc index 02c63e4..5e86009 100644 --- a/meta/site/armeb-linux-uclibc +++ b/meta/site/armeb-linux-uclibc @@ -31,8 +31,6 @@ ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} # samba samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes} -samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} -samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes} samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes} samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes} samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes} diff --git a/meta/site/common-linux b/meta/site/common-linux index e69de29..c37c76a 100644 --- a/meta/site/common-linux +++ b/meta/site/common-linux @@ -0,0 +1,5 @@ +# samba +samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no} +samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} +samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes} +samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no} diff --git a/meta/site/mipsel-linux-uclibc b/meta/site/mipsel-linux-uclibc index f36a30a..9545fea 100644 --- a/meta/site/mipsel-linux-uclibc +++ b/meta/site/mipsel-linux-uclibc @@ -93,10 +93,7 @@ samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=${samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPP samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes} samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes} samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes} -samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no} -samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
[OE-core] [PATCH 7/8] siteinfo: Move general realloc/malloc values to common-$libc
These are tests for glibc behavior which we have enabled in uclibc. Note that if we ever disable MALLOC_GLIBC_COMPAT the uclibc tests will need to be changed (but I believe this would also entail massive patching to the rest of userspace so this should be unlikely). Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/site/arm-common |4 meta/site/arm-linux |2 -- meta/site/arm-linux-uclibc|2 -- meta/site/armeb-linux |2 -- meta/site/armeb-linux-uclibc |2 -- meta/site/common-glibc|3 +++ meta/site/common-uclibc |4 meta/site/ix86-common |5 - meta/site/mips-common |3 --- meta/site/mips-linux |3 --- meta/site/mips-linux-uclibc |3 --- meta/site/mipsel-linux|3 --- meta/site/mipsel-linux-uclibc |3 --- meta/site/powerpc-common |6 -- meta/site/powerpc-linux |4 meta/site/powerpc32-linux |4 meta/site/sh-common |6 -- meta/site/sparc-linux |2 -- meta/site/x86_64-linux|2 -- meta/site/x86_64-linux-uclibc |5 - 20 files changed, 7 insertions(+), 61 deletions(-) diff --git a/meta/site/arm-common b/meta/site/arm-common index 2524db4..c216b57 100644 --- a/meta/site/arm-common +++ b/meta/site/arm-common @@ -180,10 +180,6 @@ screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes} slrn_cv___va_copy=${slrn_cv___va_copy=yes} slrn_cv_va_copy=${slrn_cv_va_copy=yes} slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} -ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} -ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} -ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} -ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} # socat ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13} diff --git a/meta/site/arm-linux b/meta/site/arm-linux index 6e69c03..69d251d 100644 --- a/meta/site/arm-linux +++ b/meta/site/arm-linux @@ -1,8 +1,6 @@ ac_cv_func_getpgrp_void=yes ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_malloc_works=yes ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no diff --git a/meta/site/arm-linux-uclibc b/meta/site/arm-linux-uclibc index 5dbdba1..1e283ef 100644 --- a/meta/site/arm-linux-uclibc +++ b/meta/site/arm-linux-uclibc @@ -1,8 +1,6 @@ ac_cv_func_getpgrp_void=yes ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_malloc_works=yes ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no diff --git a/meta/site/armeb-linux b/meta/site/armeb-linux index 45fa692..ecff3da 100644 --- a/meta/site/armeb-linux +++ b/meta/site/armeb-linux @@ -1,8 +1,6 @@ ac_cv_func_getpgrp_void=yes ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_malloc_works=yes ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no diff --git a/meta/site/armeb-linux-uclibc b/meta/site/armeb-linux-uclibc index 50874c4..8365810 100644 --- a/meta/site/armeb-linux-uclibc +++ b/meta/site/armeb-linux-uclibc @@ -1,8 +1,6 @@ ac_cv_func_getpgrp_void=yes ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_malloc_works=yes ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no diff --git a/meta/site/common-glibc b/meta/site/common-glibc index a34396f..9339655 100644 --- a/meta/site/common-glibc +++ b/meta/site/common-glibc @@ -1,5 +1,8 @@ # general ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} +ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} +ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} +ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes} ac_cv_type_uid_t={ac_cv_type_uid_t=yes} diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc index ce216bb..8ea192c 100644 --- a/meta/site/common-uclibc +++ b/meta/site/common-uclibc @@ -1,5 +1,9 @@ # general ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=no} +ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} +ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} +ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} +ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} # glib glib_cv_strlcpy=${glib_cv_strlcpy=no} diff --git a/meta/site/ix86-common b/meta/site/ix86-common index 47f7178..ea8937e
[OE-core] [PATCH 5/8] siteinfo: Move the rp-pppoe entry to common-linux
More oe.dev re-sync. Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/site/arm-linux |3 --- meta/site/common-linux|3 +++ meta/site/ix86-common |3 --- meta/site/mips-linux |3 --- meta/site/mips-linux-uclibc |3 --- meta/site/mipsel-linux|3 --- meta/site/mipsel-linux-uclibc |2 -- meta/site/sh-common |3 --- 8 files changed, 3 insertions(+), 20 deletions(-) diff --git a/meta/site/arm-linux b/meta/site/arm-linux index c141c5e..6e69c03 100644 --- a/meta/site/arm-linux +++ b/meta/site/arm-linux @@ -172,6 +172,3 @@ ac_cv_func_pthread_attr_getstack=${ac_cv_func_pthread_attr_getstack=yes} ac_cv_member_struct_sockaddr_sa_len=${ac_cv_member_struct_sockaddr_sa_len=no} ac_cv_gnet_have_abstract_sockets=${ac_cv_gnet_have_abstract_sockets=no} gnet_sockaddr_family_field_name=${gnet_sockaddr_family_field_name=ss_family} - -# rp-pppoe -rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} diff --git a/meta/site/common-linux b/meta/site/common-linux index 7cdfb63..981100c 100644 --- a/meta/site/common-linux +++ b/meta/site/common-linux @@ -23,3 +23,6 @@ bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} # mysql ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes} ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} + +# rp-pppoe +rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} diff --git a/meta/site/ix86-common b/meta/site/ix86-common index cacf7ee..fa32bb2 100644 --- a/meta/site/ix86-common +++ b/meta/site/ix86-common @@ -187,9 +187,6 @@ ac_cv_pread=${ac_cv_pread=no} ac_cv_pwrite=${ac_cv_pwrite=no} php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_off64_t=yes} -# rp-pppoe -rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} - # rsync rsync_cv_HAVE_BROKEN_LARGEFILE=${rsync_cv_HAVE_BROKEN_LARGEFILE=no} rsync_cv_HAVE_SOCKETPAIR=${rsync_cv_HAVE_SOCKETPAIR=yes} diff --git a/meta/site/mips-linux b/meta/site/mips-linux index 495df5f..f6442ce 100644 --- a/meta/site/mips-linux +++ b/meta/site/mips-linux @@ -63,9 +63,6 @@ wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long} wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long} wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes} -# rp-pppoe -rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} - # db3 db_cv_align_t=${db_cv_align_t='unsigned long long'} db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} diff --git a/meta/site/mips-linux-uclibc b/meta/site/mips-linux-uclibc index 495df5f..f6442ce 100644 --- a/meta/site/mips-linux-uclibc +++ b/meta/site/mips-linux-uclibc @@ -63,9 +63,6 @@ wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long} wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long} wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes} -# rp-pppoe -rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} - # db3 db_cv_align_t=${db_cv_align_t='unsigned long long'} db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} diff --git a/meta/site/mipsel-linux b/meta/site/mipsel-linux index 0959883..76c0dc0 100644 --- a/meta/site/mipsel-linux +++ b/meta/site/mipsel-linux @@ -64,9 +64,6 @@ wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long} wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long} wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes} -# rp-pppoe -rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} - # db3 db_cv_align_t=${db_cv_align_t='unsigned long long'} db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} diff --git a/meta/site/mipsel-linux-uclibc b/meta/site/mipsel-linux-uclibc index 25fa8b5..838bdff 100644 --- a/meta/site/mipsel-linux-uclibc +++ b/meta/site/mipsel-linux-uclibc @@ -113,5 +113,3 @@ samba_cv_sysquotas_file=${samba_cv_sysquotas_file=lib/sysquotas_4A.c} # doesn't cache it. samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes} -# rp-pppoe -rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} diff --git a/meta/site/sh-common b/meta/site/sh-common index 7fe36cc..b6b0bf5 100644 --- a/meta/site/sh-common +++ b/meta/site/sh-common @@ -230,9 +230,6 @@ cv_mono_sizeof_sunpath=108 mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no} mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no} -# rp-pppoe -rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} - # gettext am_cv_func_working_getline=${am_cv_func_working_getline=yes} -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/8] siteinfo: Move certain db entries to common-linux
Note that we had a number of unused and ignored settings wrt mutex support. These have been dropped as they weren't being used and implied some odd things to boot. This is also a partial resync with oe.dev which had some, but not all of these changes. Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/site/arm-common | 12 meta/site/common-linux| 11 +++ meta/site/ix86-common | 12 meta/site/mips-linux | 14 +- meta/site/mips-linux-uclibc | 14 +- meta/site/mipsel-linux| 14 +- meta/site/powerpc-common | 14 +- meta/site/powerpc32-linux | 14 +- meta/site/sh-common | 14 +- meta/site/x86_64-linux| 14 ++ meta/site/x86_64-linux-uclibc | 12 11 files changed, 19 insertions(+), 126 deletions(-) diff --git a/meta/site/arm-common b/meta/site/arm-common index 2880cfc..2524db4 100644 --- a/meta/site/arm-common +++ b/meta/site/arm-common @@ -25,20 +25,8 @@ cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} # db (sleepycat) db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} db_cv_sprintf_count=${db_cv_sprintf_count=yes} -db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} -db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} -db_cv_path_cp=${db_cv_path_cp=/bin/cp} -db_cv_path_ln=${db_cv_path_ln=/bin/ln} -db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} -db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} -db_cv_path_rm=${db_cv_path_rm=/bin/rm} -db_cv_path_sh=${db_cv_path_sh=/bin/sh} -db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} db_cv_align_t=${db_cv_align_t='unsigned long long'} db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} -db_cv_mutex=${db_cv_mutex=no} -db_cv_posixmutexes=${db_cv_posixmutexes=no} -db_cv_uimutexes=${db_cv_uimutexes=no} # D-BUS ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} diff --git a/meta/site/common-linux b/meta/site/common-linux index 981100c..1b4d182 100644 --- a/meta/site/common-linux +++ b/meta/site/common-linux @@ -4,6 +4,17 @@ samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes} samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no} +# db +db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} +db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} +db_cv_path_cp=${db_cv_path_cp=/bin/cp} +db_cv_path_ln=${db_cv_path_ln=/bin/ln} +db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} +db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} +db_cv_path_rm=${db_cv_path_rm=/bin/rm} +db_cv_path_sh=${db_cv_path_sh=/bin/sh} +db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} + # bash bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} diff --git a/meta/site/ix86-common b/meta/site/ix86-common index fa32bb2..47f7178 100644 --- a/meta/site/ix86-common +++ b/meta/site/ix86-common @@ -72,19 +72,7 @@ cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} db_cv_align_t=${db_cv_align_t='unsigned long long'} db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} -db_cv_mutex=${db_cv_mutex=x86/gcc-assembly} -db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} -db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} -db_cv_path_cp=${db_cv_path_cp=/bin/cp} -db_cv_path_ln=${db_cv_path_ln=/bin/ln} -db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} -db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} -db_cv_path_rm=${db_cv_path_rm=/bin/rm} -db_cv_path_sh=${db_cv_path_sh=/bin/sh} -db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} -db_cv_posixmutexes=${db_cv_posixmutexes=no} db_cv_sprintf_count=${db_cv_sprintf_count=yes} -db_cv_uimutexes=${db_cv_uimutexes=no} # D-BUS ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} diff --git a/meta/site/mips-linux b/meta/site/mips-linux index f6442ce..f81d4fa 100644 --- a/meta/site/mips-linux +++ b/meta/site/mips-linux @@ -63,23 +63,11 @@ wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long} wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long} wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes} -# db3 +# db db_cv_align_t=${db_cv_align_t='unsigned long long'} db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} -db_cv_mutex=${db_cv_mutex=POSIX/pthreads/library} -db_cv_posixmutexes=${db_cv_posixmutexes=no} -db_cv_uimutexes=${db_cv_uimutexes=no} db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} db_cv_sprintf_count=${db_cv_sprintf_count=yes} -db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} -db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} -db_cv_path_cp=${db_cv_path_cp=/bin/cp} -db_cv_path_ln=${db_cv_path_ln=/bin/ln} -db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} -db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} -db_cv_path_rm=${db_cv_path_rm=/bin/rm} -db_cv_path_sh=${db_cv_path_sh=/bin/sh}
Re: [OE-core] [PATCH 1/8] siteinfo: Move certain samba entries to common-linux
diff --git a/meta/site/powerpc-common b/meta/site/powerpc-common index e69de29..145da0d 100644 --- a/meta/site/powerpc-common +++ b/meta/site/powerpc-common @@ -0,0 +1,325 @@ +ac_cv_func_getpgrp_void=yes +ac_cv_func_setpgrp_void=yes +ac_cv_func_setgrent_void=yes +ac_cv_func_malloc_0_nonnull=yes +ac_cv_func_malloc_works=yes +ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} +ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} +ac_cv_func_setvbuf_reversed=no +ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} +ac_cv_sizeof_bool=${ac_cv_sizeof_bool=1} +ac_cv_sizeof_char=${ac_cv_sizeof_char=1} +ac_cv_sizeof_double=${ac_cv_sizeof_double=8} +ac_cv_sizeof_int=${ac_cv_sizeof_int=4} +ac_cv_sizeof_int_p=${ac_cv_sizeof_int_p=4} +ac_cv_sizeof_float=${ac_cv_sizeof_float=4} +ac_cv_sizeof_long=${ac_cv_sizeof_long=4} +ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=4} +ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8} +ac_cv_sizeof_short=${ac_cv_sizeof_short=2} +ac_cv_sizeof_unsigned_char=${ac_cv_sizeof_unsigned_char=1} +ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2} +ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4} +ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4} +ac_cv_sizeof_long_p=${ac_cv_sizeof_long_p=4} +ac_cv_sizeof_wchar_t=${ac_cv_sizeof_wchar_t=4} +ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8} +ac_cv_sys_restartable_syscalls=yes +ac_cv_type___int64=${ac_cv_type___int64=no} +ac_cv_type_size_t=${ac_cv_type_size_t=yes} +ac_cv_type_void_p=${ac_cv_type_void_p=yes} +ac_cv_uchar=${ac_cv_uchar=no} +ac_cv_uint=${ac_cv_uint=yes} +ac_cv_ulong=${ac_cv_ulong=yes} +ac_cv_ushort=${ac_cv_ushort=yes} +ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} +cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes} This is wrong for PPC.. will break ppc64 - k + + +# apache +ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} +apr_cv_process_shared_works=${apr_cv_process_shared_works=no} +ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} + +ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} +ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} +ac_cv_sctp=${ac_cv_sctp=no} + +# ssh +ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes} +ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no} +ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} +ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes} +ac_cv_type_struct_timespec=${ac_cv_type_struct_timespec=yes} +ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes} + +# coreutils +utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} + +# libpcap +ac_cv_linux_vers=${ac_cv_linux_vers=2} + +# nano +ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} +nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} + + +# libnet +ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes} + +# screen +screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no} +screen_cv_sys_memcpy_overlap=${screen_cv_sys_memcpy_overlap=no} +screen_cv_sys_memmove_overlap=${screen_cv_sys_memmove_overlap=no} +screen_cv_sys_fifo_broken_impl=${screen_cv_sys_fifo_broken_impl=yes} +screen_cv_sys_fifo_usable=${screen_cv_sys_fifo_usable=yes} +screen_cv_sys_select_broken_retval=${screen_cv_sys_select_broken_retval=no} +screen_cv_sys_sockets_nofs=${screen_cv_sys_sockets_nofs=no} +screen_cv_sys_sockets_usable=${screen_cv_sys_sockets_usable=yes} +screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes} + +ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes} +ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no} +ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no} +ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no} + +# socat +ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13} +sc_cv_termios_ispeed=${sc_cv_termios_ispeed=yes} + +# links +ac_cv_lib_png_png_create_info_struct=${ac_cv_lib_png_png_create_info_struct=yes} + +# sleepycat db +db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} +db_cv_sprintf_count=${db_cv_sprintf_count=yes} +db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} +db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} +db_cv_path_cp=${db_cv_path_cp=/bin/cp} +db_cv_path_ln=${db_cv_path_ln=/bin/ln} +db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} +db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} +db_cv_path_rm=${db_cv_path_rm=/bin/rm} +db_cv_path_sh=${db_cv_path_sh=/bin/sh} +db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} +db_cv_align_t=${db_cv_align_t='unsigned long long'} +db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} +db_cv_mutex=${db_cv_mutex=no} +db_cv_posixmutexes=${db_cv_posixmutexes=no} +db_cv_uimutexes=${db_cv_uimutexes=no} + +# php +ac_cv_pread=${ac_cv_pread=no}
Re: [OE-core] [PATCH v2 0/1] Resync siteinfo.bbclass with oe.dev
On 07/22/2011 08:35 AM, Koen Kooi wrote: Op 20 jul. 2011, om 22:50 heeft Tom Rini het volgende geschreven: Hey all, This is the second of two pull requests. This doesn't depend on the first request, it's just splitting changes up. There's three changes here. First, site/ix86-common was setting the wrong value for unsigned int. Second, change perl to use SITEINFO variables rather than functions. We're down to one change now to re-sync siteinfo.bbclass with oe-core and oe.dev. This re-works the functions a bit inside siteinfo.bbclass to be easier to add new platforms (and hopefully multilibs) to. My next step is to work on merging and verifying as much as possible the site files in oe-core and oe.dev. v2: Rework based on Richard's comments to not be a generator and just return a string list again. Not that it has been merged, can the siteinfo from meta-oe get deleted? The class? yes. It wasn't being used anyhow :) -- Tom Rini Mentor Graphics Corporation ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/8] siteinfo: Move certain samba entries to common-linux
On 07/22/2011 09:39 AM, Kumar Gala wrote: diff --git a/meta/site/powerpc-common b/meta/site/powerpc-common index e69de29..145da0d 100644 --- a/meta/site/powerpc-common +++ b/meta/site/powerpc-common @@ -0,0 +1,325 @@ +ac_cv_func_getpgrp_void=yes +ac_cv_func_setpgrp_void=yes +ac_cv_func_setgrent_void=yes +ac_cv_func_malloc_0_nonnull=yes +ac_cv_func_malloc_works=yes +ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} +ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} +ac_cv_func_setvbuf_reversed=no +ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} +ac_cv_sizeof_bool=${ac_cv_sizeof_bool=1} +ac_cv_sizeof_char=${ac_cv_sizeof_char=1} +ac_cv_sizeof_double=${ac_cv_sizeof_double=8} +ac_cv_sizeof_int=${ac_cv_sizeof_int=4} +ac_cv_sizeof_int_p=${ac_cv_sizeof_int_p=4} +ac_cv_sizeof_float=${ac_cv_sizeof_float=4} +ac_cv_sizeof_long=${ac_cv_sizeof_long=4} +ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=4} +ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8} +ac_cv_sizeof_short=${ac_cv_sizeof_short=2} +ac_cv_sizeof_unsigned_char=${ac_cv_sizeof_unsigned_char=1} +ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2} +ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4} +ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4} +ac_cv_sizeof_long_p=${ac_cv_sizeof_long_p=4} +ac_cv_sizeof_wchar_t=${ac_cv_sizeof_wchar_t=4} +ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8} +ac_cv_sys_restartable_syscalls=yes +ac_cv_type___int64=${ac_cv_type___int64=no} +ac_cv_type_size_t=${ac_cv_type_size_t=yes} +ac_cv_type_void_p=${ac_cv_type_void_p=yes} +ac_cv_uchar=${ac_cv_uchar=no} +ac_cv_uint=${ac_cv_uint=yes} +ac_cv_ulong=${ac_cv_ulong=yes} +ac_cv_ushort=${ac_cv_ushort=yes} +ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} +cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes} This is wrong for PPC.. will break ppc64 Yeah, that wasn't supposed to be in there, sorry. I'll v2 this all shortly then. -- Tom Rini Mentor Graphics Corporation ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 3/8] x86_64-linux siteinfo: Add bash info
Taken from oe.dev Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/site/x86_64-linux |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/meta/site/x86_64-linux b/meta/site/x86_64-linux index ba6e57c..076e5b6 100644 --- a/meta/site/x86_64-linux +++ b/meta/site/x86_64-linux @@ -89,6 +89,11 @@ ac_cv_lib_m_sin=${ac_cv_lib_m_sin=yes} #orbit libIDL_cv_long_long_format=ll + +# bash +bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present} + +# ORBit2 ac_cv_alignof_CORBA_boolean=1 ac_cv_alignof_CORBA_char=1 ac_cv_alignof_CORBA_double=8 -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/8] siteinfo: Move certain bash entries to common-linux
More re-sync with oe.dev Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/site/arm-common | 14 -- meta/site/common-linux| 16 meta/site/ix86-common | 14 -- meta/site/mips-linux |3 --- meta/site/mips-linux-uclibc |3 --- meta/site/mipsel-linux| 14 -- meta/site/mipsel-linux-uclibc | 14 -- meta/site/powerpc-linux |3 --- meta/site/powerpc32-linux | 13 - meta/site/sh-common | 14 -- meta/site/sparc-linux |3 --- meta/site/x86_64-linux|1 - meta/site/x86_64-linux-uclibc |1 - 13 files changed, 16 insertions(+), 97 deletions(-) diff --git a/meta/site/arm-common b/meta/site/arm-common index 5d3e68a..39eb30b 100644 --- a/meta/site/arm-common +++ b/meta/site/arm-common @@ -14,21 +14,7 @@ apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} # bash ac_cv_c_long_double=${ac_cv_c_long_double=yes} -bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} -bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} -bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_dup2_broken=${bash_cv_dup2_broken=no} -bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} -bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} -bash_cv_getenv_redef=${bash_cv_getenv_redef=yes} -bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes} -bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no} -bash_cv_printf_a_format=${bash_cv_printf_a_format=yes} -bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} -bash_cv_job_control_missing=${bash_cv_job_control_missing=present} -bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} -bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} # coreutils utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} diff --git a/meta/site/common-linux b/meta/site/common-linux index c37c76a..74a822d 100644 --- a/meta/site/common-linux +++ b/meta/site/common-linux @@ -3,3 +3,19 @@ samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no} samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes} samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no} + +# bash +bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} +bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} +bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} +bash_cv_dup2_broken=${bash_cv_dup2_broken=no} +bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} +bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} +bash_cv_getenv_redef=${bash_cv_getenv_redef=yes} +bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes} +bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no} +bash_cv_printf_a_format=${bash_cv_printf_a_format=yes} +bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} +bash_cv_job_control_missing=${bash_cv_job_control_missing=present} +bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} +bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} diff --git a/meta/site/ix86-common b/meta/site/ix86-common index 4a4442a..267d59f 100644 --- a/meta/site/ix86-common +++ b/meta/site/ix86-common @@ -58,21 +58,7 @@ ac_cv_file_lib_src_libmad_frame_h=${ac_cv_file_lib_src_libmad_frame_h=no} # bash ac_cv_c_long_double=${ac_cv_c_long_double=yes} -bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} -bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} -bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} -bash_cv_dup2_broken=${bash_cv_dup2_broken=no} -bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} -bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} -bash_cv_getenv_redef=${bash_cv_getenv_redef=yes} -bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes} -bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no} -bash_cv_printf_a_format=${bash_cv_printf_a_format=yes} -bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} -bash_cv_job_control_missing=${bash_cv_job_control_missing=present} -bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} -bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} # clamav clamav_av_func_working_snprintf_long=${clamav_av_func_working_snprintf_long=yes} diff --git a/meta/site/mips-linux b/meta/site/mips-linux index 074cb09..495df5f 100644 --- a/meta/site/mips-linux +++ b/meta/site/mips-linux @@ -118,9 +118,6 @@ mono_cv_uscore=${mono_cv_uscore=no} ac_cv_va_copy=${ac_cv_va_copy=yes} ac_cv___va_copy=${ac_cv___va_copy=yes} -# readline -bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} - # eds-dbus ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} diff --git a/meta/site/mips-linux-uclibc b/meta/site/mips-linux-uclibc index 074cb09..495df5f 100644 --- a/meta/site/mips-linux-uclibc +++
[OE-core] [PATCH v2 0/8] Start consolidating siteinfo information
Hey all, As I've been talking about for a while, here is the first part of re-syncing oe.dev siteinfo files with oe-core AND doing more consolidation. There's more to do, but I don't want this to grow too large before I start submitting. This contains what I would call the obviously correct stuff where: - all of the common platforms set things to the same value - A little poking around shows it's a libc test or a standard linux feature. - All of the arches that didn't set it just hadn't tried to build that yet. The only part that's not 100% in that would be the db mutex drops. But after trying the version of db we have and looking at the recipe: - These values weren't being used at all and were incorrect in some cases anyhow (eg x86_64 uclibc went with the x86_64 asm bits it has for mutex, not none) - It's not how you set mutex bits either. ie arm was doing one thing in siteinfo and the recipe another and the way the recipe did it, works. v2: Don't bogusly populate powerpc-common, catch a few more samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES The following changes since commit b4c23fce3eadaff8fc621d38759d493cd03cc131: Koen Kooi (1): consolekit 0.4.5: fix PAM installation dir are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib trini/update-site-files-22jul-v2 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/update-site-files-22jul-v2 Tom Rini (8): siteinfo: Move certain samba entries to common-linux siteinfo: Move certain bash entries to common-linux x86_64-linux siteinfo: Add bash info siteinfo: Move certain mysql entries to common-linux siteinfo: Move the rp-pppoe entry to common-linux siteinfo: Move certain db entries to common-linux siteinfo: Move general realloc/malloc values to common-$libc siteinfo: Move (getpgrp|setpgrp|setgrent|*get{pwuid,grgid}) to common-libc meta/site/arm-common | 35 --- meta/site/arm-linux | 15 - meta/site/arm-linux-uclibc| 12 --- meta/site/armeb-linux | 10 - meta/site/armeb-linux-uclibc | 10 - meta/site/common-glibc| 10 + meta/site/common-linux| 39 +++ meta/site/common-uclibc | 11 ++ meta/site/ix86-common | 43 --- meta/site/mips-common |3 -- meta/site/mips-linux | 29 +- meta/site/mips-linux-uclibc | 29 +- meta/site/mipsel-linux| 40 +--- meta/site/mipsel-linux-uclibc | 26 --- meta/site/powerpc-linux | 13 --- meta/site/powerpc32-linux | 36 +--- meta/site/sh-common | 45 + meta/site/sparc-linux | 10 - meta/site/x86_64-linux| 28 ++--- meta/site/x86_64-linux-uclibc | 23 - 20 files changed, 72 insertions(+), 395 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 6/8] siteinfo: Move certain db entries to common-linux
Note that we had a number of unused and ignored settings wrt mutex support. These have been dropped as they weren't being used and implied some odd things to boot. This is also a partial resync with oe.dev which had some, but not all of these changes. Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/site/arm-common | 12 meta/site/common-linux| 11 +++ meta/site/ix86-common | 12 meta/site/mips-linux | 14 +- meta/site/mips-linux-uclibc | 14 +- meta/site/mipsel-linux| 14 +- meta/site/powerpc32-linux | 14 +- meta/site/sh-common | 14 +- meta/site/x86_64-linux| 14 ++ meta/site/x86_64-linux-uclibc | 12 10 files changed, 18 insertions(+), 113 deletions(-) diff --git a/meta/site/arm-common b/meta/site/arm-common index 2880cfc..2524db4 100644 --- a/meta/site/arm-common +++ b/meta/site/arm-common @@ -25,20 +25,8 @@ cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} # db (sleepycat) db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} db_cv_sprintf_count=${db_cv_sprintf_count=yes} -db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} -db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} -db_cv_path_cp=${db_cv_path_cp=/bin/cp} -db_cv_path_ln=${db_cv_path_ln=/bin/ln} -db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} -db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} -db_cv_path_rm=${db_cv_path_rm=/bin/rm} -db_cv_path_sh=${db_cv_path_sh=/bin/sh} -db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} db_cv_align_t=${db_cv_align_t='unsigned long long'} db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} -db_cv_mutex=${db_cv_mutex=no} -db_cv_posixmutexes=${db_cv_posixmutexes=no} -db_cv_uimutexes=${db_cv_uimutexes=no} # D-BUS ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} diff --git a/meta/site/common-linux b/meta/site/common-linux index 981100c..1b4d182 100644 --- a/meta/site/common-linux +++ b/meta/site/common-linux @@ -4,6 +4,17 @@ samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes} samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes} samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no} +# db +db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} +db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} +db_cv_path_cp=${db_cv_path_cp=/bin/cp} +db_cv_path_ln=${db_cv_path_ln=/bin/ln} +db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} +db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} +db_cv_path_rm=${db_cv_path_rm=/bin/rm} +db_cv_path_sh=${db_cv_path_sh=/bin/sh} +db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} + # bash bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} diff --git a/meta/site/ix86-common b/meta/site/ix86-common index fa32bb2..47f7178 100644 --- a/meta/site/ix86-common +++ b/meta/site/ix86-common @@ -72,19 +72,7 @@ cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} db_cv_align_t=${db_cv_align_t='unsigned long long'} db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} -db_cv_mutex=${db_cv_mutex=x86/gcc-assembly} -db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} -db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} -db_cv_path_cp=${db_cv_path_cp=/bin/cp} -db_cv_path_ln=${db_cv_path_ln=/bin/ln} -db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} -db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} -db_cv_path_rm=${db_cv_path_rm=/bin/rm} -db_cv_path_sh=${db_cv_path_sh=/bin/sh} -db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} -db_cv_posixmutexes=${db_cv_posixmutexes=no} db_cv_sprintf_count=${db_cv_sprintf_count=yes} -db_cv_uimutexes=${db_cv_uimutexes=no} # D-BUS ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} diff --git a/meta/site/mips-linux b/meta/site/mips-linux index f6442ce..f81d4fa 100644 --- a/meta/site/mips-linux +++ b/meta/site/mips-linux @@ -63,23 +63,11 @@ wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long} wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long} wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes} -# db3 +# db db_cv_align_t=${db_cv_align_t='unsigned long long'} db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} -db_cv_mutex=${db_cv_mutex=POSIX/pthreads/library} -db_cv_posixmutexes=${db_cv_posixmutexes=no} -db_cv_uimutexes=${db_cv_uimutexes=no} db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} db_cv_sprintf_count=${db_cv_sprintf_count=yes} -db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} -db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} -db_cv_path_cp=${db_cv_path_cp=/bin/cp} -db_cv_path_ln=${db_cv_path_ln=/bin/ln} -db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} -db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} -db_cv_path_rm=${db_cv_path_rm=/bin/rm} -db_cv_path_sh=${db_cv_path_sh=/bin/sh} -db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} #
[OE-core] [PATCH v2 4/8] siteinfo: Move certain mysql entries to common-linux
More re-sync with oe.dev Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/site/arm-common |1 - meta/site/arm-linux |1 - meta/site/arm-linux-uclibc |1 - meta/site/armeb-linux|1 - meta/site/armeb-linux-uclibc |1 - meta/site/common-linux |4 meta/site/ix86-common|3 --- meta/site/powerpc32-linux|2 -- meta/site/sh-common |2 -- meta/site/sparc-linux|1 - 10 files changed, 4 insertions(+), 13 deletions(-) diff --git a/meta/site/arm-common b/meta/site/arm-common index 39eb30b..2880cfc 100644 --- a/meta/site/arm-common +++ b/meta/site/arm-common @@ -138,7 +138,6 @@ cv_mono_sizeof_sunpath=108 # mysql mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no} mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no} -ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} # nano ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} diff --git a/meta/site/arm-linux b/meta/site/arm-linux index cb3bcbb..96a1dde 100644 --- a/meta/site/arm-linux +++ b/meta/site/arm-linux @@ -34,7 +34,6 @@ ac_cv_sizeof_unsigned_long=${ac_cv_sizeof_unsigned_long=4} ac_cv_sizeof_unsigned_long_long=${ac_cv_sizeof_unsigned_long_long=8} ac_cv_sizeof_signed_char=${ac_cv_sizeof_signed_char=1} -ac_cv_sys_restartable_syscalls=yes ac_cv_uchar=${ac_cv_uchar=no} ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} diff --git a/meta/site/arm-linux-uclibc b/meta/site/arm-linux-uclibc index 55cd68e..017594d 100644 --- a/meta/site/arm-linux-uclibc +++ b/meta/site/arm-linux-uclibc @@ -18,7 +18,6 @@ ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4} ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4} ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8} -ac_cv_sys_restartable_syscalls=yes ac_cv_uchar=${ac_cv_uchar=no} ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} diff --git a/meta/site/armeb-linux b/meta/site/armeb-linux index d8da123..45fa692 100644 --- a/meta/site/armeb-linux +++ b/meta/site/armeb-linux @@ -21,7 +21,6 @@ ac_cv_sizeof_char_p=${ac_cv_sizeof_char_p=4} ac_cv_sizeof_unsigned=${ac_cv_sizeof_unsigned=4} ac_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} -ac_cv_sys_restartable_syscalls=yes ac_cv_uchar=${ac_cv_uchar=no} ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} diff --git a/meta/site/armeb-linux-uclibc b/meta/site/armeb-linux-uclibc index 5e86009..50874c4 100644 --- a/meta/site/armeb-linux-uclibc +++ b/meta/site/armeb-linux-uclibc @@ -21,7 +21,6 @@ ac_cv_sizeof_char_p=${ac_cv_sizeof_char_p=4} ac_cv_sizeof_unsigned=${ac_cv_sizeof_unsigned=4} ac_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} -ac_cv_sys_restartable_syscalls=yes ac_cv_uchar=${ac_cv_uchar=no} ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} diff --git a/meta/site/common-linux b/meta/site/common-linux index 74a822d..7cdfb63 100644 --- a/meta/site/common-linux +++ b/meta/site/common-linux @@ -19,3 +19,7 @@ bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} bash_cv_job_control_missing=${bash_cv_job_control_missing=present} bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} + +# mysql +ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes} +ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} diff --git a/meta/site/ix86-common b/meta/site/ix86-common index 267d59f..cacf7ee 100644 --- a/meta/site/ix86-common +++ b/meta/site/ix86-common @@ -47,7 +47,6 @@ lf_cv_sane_realloc=yes jm_cv_func_gettimeofday_clobber=no samba_cv_HAVE_GETTIMEOFDAY_TZ=yes bf_lsbf=1 -ac_cv_sys_restartable_syscalls=yes ac_cv_uchar=${ac_cv_uchar=no} ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} @@ -126,7 +125,6 @@ glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes} ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} # guile -ac_cv_sys_restartable_syscalls=yes ac_cv_uchar=${ac_cv_uchar=no} ac_cv_uint=${ac_cv_uint=yes} ac_cv_ulong=${ac_cv_ulong=yes} @@ -165,7 +163,6 @@ cv_mono_sizeof_sunpath=108 # mysql mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=yes} mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=yes} -ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} # ORBit2 ac_cv_alignof_CORBA_boolean=1 diff --git a/meta/site/powerpc32-linux b/meta/site/powerpc32-linux index 9d89f73..3a05053 100644 --- a/meta/site/powerpc32-linux +++ b/meta/site/powerpc32-linux @@ -28,7 +28,6 @@ ac_cv_sizeof_unsigned_short=${ac_cv_sizeof_unsigned_short=2} ac_cv_sizeof_unsigned_short_int=${ac_cv_sizeof_unsigned_short_int=2} ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4} ac_cv_sizeof_wchar_t=${ac_cv_sizeof_wchar_t=4} -ac_cv_sys_restartable_syscalls=yes ac_cv_type___int64=${ac_cv_type___int64=no} ac_cv_type_size_t=${ac_cv_type_size_t=yes} ac_cv_type_void_p=${ac_cv_type_void_p=yes} @@ -296,7 +295,6 @@ ac_cv_sync_with_stdio_2=${ac_cv_sync_with_stdio_2=yes} # mysql
[OE-core] [PATCH v2 7/8] siteinfo: Move general realloc/malloc values to common-$libc
These are tests for glibc behavior which we have enabled in uclibc. Note that if we ever disable MALLOC_GLIBC_COMPAT the uclibc tests will need to be changed (but I believe this would also entail massive patching to the rest of userspace so this should be unlikely). Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/site/arm-common |4 meta/site/arm-linux |2 -- meta/site/arm-linux-uclibc|2 -- meta/site/armeb-linux |2 -- meta/site/armeb-linux-uclibc |2 -- meta/site/common-glibc|3 +++ meta/site/common-uclibc |4 meta/site/ix86-common |5 - meta/site/mips-common |3 --- meta/site/mips-linux |3 --- meta/site/mips-linux-uclibc |3 --- meta/site/mipsel-linux|3 --- meta/site/mipsel-linux-uclibc |3 --- meta/site/powerpc-linux |4 meta/site/powerpc32-linux |4 meta/site/sh-common |6 -- meta/site/sparc-linux |2 -- meta/site/x86_64-linux|2 -- meta/site/x86_64-linux-uclibc |5 - 19 files changed, 7 insertions(+), 55 deletions(-) diff --git a/meta/site/arm-common b/meta/site/arm-common index 2524db4..c216b57 100644 --- a/meta/site/arm-common +++ b/meta/site/arm-common @@ -180,10 +180,6 @@ screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes} slrn_cv___va_copy=${slrn_cv___va_copy=yes} slrn_cv_va_copy=${slrn_cv_va_copy=yes} slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} -ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} -ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} -ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} -ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} # socat ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13} diff --git a/meta/site/arm-linux b/meta/site/arm-linux index 1211ad4..8ac9041 100644 --- a/meta/site/arm-linux +++ b/meta/site/arm-linux @@ -1,8 +1,6 @@ ac_cv_func_getpgrp_void=yes ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_malloc_works=yes ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no diff --git a/meta/site/arm-linux-uclibc b/meta/site/arm-linux-uclibc index 017594d..70d0908 100644 --- a/meta/site/arm-linux-uclibc +++ b/meta/site/arm-linux-uclibc @@ -1,8 +1,6 @@ ac_cv_func_getpgrp_void=yes ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_malloc_works=yes ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no diff --git a/meta/site/armeb-linux b/meta/site/armeb-linux index 45fa692..ecff3da 100644 --- a/meta/site/armeb-linux +++ b/meta/site/armeb-linux @@ -1,8 +1,6 @@ ac_cv_func_getpgrp_void=yes ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_malloc_works=yes ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no diff --git a/meta/site/armeb-linux-uclibc b/meta/site/armeb-linux-uclibc index 50874c4..8365810 100644 --- a/meta/site/armeb-linux-uclibc +++ b/meta/site/armeb-linux-uclibc @@ -1,8 +1,6 @@ ac_cv_func_getpgrp_void=yes ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_malloc_works=yes ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no diff --git a/meta/site/common-glibc b/meta/site/common-glibc index a34396f..9339655 100644 --- a/meta/site/common-glibc +++ b/meta/site/common-glibc @@ -1,5 +1,8 @@ # general ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} +ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} +ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} +ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes} ac_cv_type_uid_t={ac_cv_type_uid_t=yes} diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc index ce216bb..8ea192c 100644 --- a/meta/site/common-uclibc +++ b/meta/site/common-uclibc @@ -1,5 +1,9 @@ # general ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=no} +ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} +ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} +ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} +ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} # glib glib_cv_strlcpy=${glib_cv_strlcpy=no} diff --git a/meta/site/ix86-common b/meta/site/ix86-common index 47f7178..ea8937e 100644 --- a/meta/site/ix86-common +++
[OE-core] [PATCH v2 8/8] siteinfo: Move (getpgrp|setpgrp|setgrent|*get{pwuid, grgid}) to common-libc
These functions are determined by the C library so move them to common-glibc and common-uclibc Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/site/arm-common |4 meta/site/arm-linux |5 - meta/site/arm-linux-uclibc|5 - meta/site/armeb-linux |5 - meta/site/armeb-linux-uclibc |5 - meta/site/common-glibc|7 +++ meta/site/common-uclibc |7 +++ meta/site/ix86-common |6 -- meta/site/mips-linux |6 -- meta/site/mips-linux-uclibc |6 -- meta/site/mipsel-linux|6 -- meta/site/mipsel-linux-uclibc |4 meta/site/powerpc-linux |6 -- meta/site/sh-common |4 meta/site/sparc-linux |4 meta/site/x86_64-linux|6 -- meta/site/x86_64-linux-uclibc |5 - 17 files changed, 14 insertions(+), 77 deletions(-) diff --git a/meta/site/arm-common b/meta/site/arm-common index c216b57..04d1164 100644 --- a/meta/site/arm-common +++ b/meta/site/arm-common @@ -48,9 +48,6 @@ ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes} # gettext am_cv_func_working_getline=${am_cv_func_working_getline=yes} -# gio -ac_cv_func_getgrgid_r=${ac_cv_func_getgrgid_r=yes} - # glib glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} @@ -67,7 +64,6 @@ glib_cv_va_copy=${glib_cv_va_copy=yes} glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} glib_cv___va_copy=${glib_cv___va_copy=yes} glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no} -ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} glib_cv_sys_pthread_mutex_trylock_posix=${glib_cv_sys_pthread_mutex_trylock_posix=yes} glib_cv_sys_pthread_getspecific_posix=${glib_cv_sys_pthread_getspecific_posix=yes} glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_posix=yes} diff --git a/meta/site/arm-linux b/meta/site/arm-linux index 8ac9041..412be5a 100644 --- a/meta/site/arm-linux +++ b/meta/site/arm-linux @@ -1,8 +1,3 @@ -ac_cv_func_getpgrp_void=yes -ac_cv_func_setpgrp_void=yes -ac_cv_func_setgrent_void=yes -ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} -ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} ac_cv_sizeof_char=${ac_cv_sizeof_char=1} diff --git a/meta/site/arm-linux-uclibc b/meta/site/arm-linux-uclibc index 70d0908..6ae7c6e 100644 --- a/meta/site/arm-linux-uclibc +++ b/meta/site/arm-linux-uclibc @@ -1,8 +1,3 @@ -ac_cv_func_getpgrp_void=yes -ac_cv_func_setpgrp_void=yes -ac_cv_func_setgrent_void=yes -ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} -ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} ac_cv_sizeof_char=${ac_cv_sizeof_char=1} diff --git a/meta/site/armeb-linux b/meta/site/armeb-linux index ecff3da..6521ff5 100644 --- a/meta/site/armeb-linux +++ b/meta/site/armeb-linux @@ -1,8 +1,3 @@ -ac_cv_func_getpgrp_void=yes -ac_cv_func_setpgrp_void=yes -ac_cv_func_setgrent_void=yes -ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} -ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} ac_cv_sizeof_char=${ac_cv_sizeof_char=1} diff --git a/meta/site/armeb-linux-uclibc b/meta/site/armeb-linux-uclibc index 8365810..731e857 100644 --- a/meta/site/armeb-linux-uclibc +++ b/meta/site/armeb-linux-uclibc @@ -1,8 +1,3 @@ -ac_cv_func_getpgrp_void=yes -ac_cv_func_setpgrp_void=yes -ac_cv_func_setgrent_void=yes -ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} -ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_func_setvbuf_reversed=no ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} ac_cv_sizeof_char=${ac_cv_sizeof_char=1} diff --git a/meta/site/common-glibc b/meta/site/common-glibc index 9339655..8cfa695 100644 --- a/meta/site/common-glibc +++ b/meta/site/common-glibc @@ -5,6 +5,13 @@ ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes} +ac_cv_func_getpgrp_void=yes +ac_cv_func_setpgrp_void=yes +ac_cv_func_setgrent_void=yes +ac_cv_func_getgrgid_r=${ac_cv_func_getgrgid_r=yes} +ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes} +ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} +ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes} ac_cv_type_uid_t={ac_cv_type_uid_t=yes} # bash diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc index 8ea192c..093f60e 100644 --- a/meta/site/common-uclibc +++ b/meta/site/common-uclibc @@ -4,6 +4,13 @@ ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes}
[OE-core] [PATCH 5/3] conf/machine/include: Start to fill out architecture specific tune include files and tune features
These changes revolve around the idea of tune features. These are represented by 'flag' strings that are included in the TUNE_FEATURES variable. Any string included in TUNE_FEATURES should also add a TUNEVALID[name] entry so we can know which flags are available in TUNE_FEATURES and have documentation about what the flags do. We will add sanity code to error if flags are listed in TUNE_FEATURES but are not documented in TUNEVALID. A given tune configuration will want to define one or more predetermined sets of _FEATURE flag lists. These are defined in the form TUNE_FEATURES_tune-name. For defined tune configuation, name should be added to the AVAILTUNE list so that we can determine what tune configurations are available. Flags cannot be used in this case as with TUNEVALID since its useful to be able to build up tune lists from other TUNE_FEATURES_tune-yyy options. A given tune configuration may also define PACKAGE_EXTRA_ARCHS_tune-name and BASE_LIB_tune-name to control the multilib location. All options can be overridden by the distro or local user configuration. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 47ce023..61312bc 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -83,6 +83,8 @@ HOST_EXEEXT = TUNE_ARCH ??= INVALID TUNE_CCARGS ??= +TUNE_FEATURES ??= ${TUNE_FEATURES_tune-${DEFAULTTUNE}} +PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE} ??= ${TARGET_ARCH} TARGET_ARCH = ${TUNE_ARCH} TARGET_OS = INVALID @@ -100,7 +102,7 @@ SDK_CC_ARCH = ${BUILD_CC_ARCH} PACKAGE_ARCH = ${TUNE_PKGARCH} MACHINE_ARCH = ${@[bb.data.getVar('TUNE_PKGARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')} -PACKAGE_EXTRA_ARCHS ??= ${TARGET_ARCH} +PACKAGE_EXTRA_ARCHS ??= ${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}} PACKAGE_ARCHS = all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH} # MACHINE_ARCH shouldn't be included here as a variable dependency # since machine specific packages are handled using multimachine diff --git a/meta/conf/machine/include/arm/arch-arm.inc b/meta/conf/machine/include/arm/arch-arm.inc new file mode 100644 index 000..e773d14 --- a/dev/null +++ b/meta/conf/machine/include/arm/arch-arm.inc @@ -0,0 +1 @@ +TUNE_ARCH = arm diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc new file mode 100644 index 000..3a9d0bc --- a/dev/null +++ b/meta/conf/machine/include/ia32/arch-ia32.inc @@ -0,0 +1,29 @@ +# +# IA32 Architecture definition +# + +DEFAULTTUNE = x86 +TARGET_FPU = hard + +# ELF32 ABI +TUNEVALID[m32] = IA32 ELF32 standard ABI +TUNECONFLICTS[m32] = m64 +TUNE_ARCH .= ${@bb.utils.contains(TUNE_FEATURES, m32, i586, ,d)} +TUNE_CCARGS += ${@bb.utils.contains(TUNE_FEATURES, m32, -m32, , d)} + +# ELF64 ABI +TUNEVALID[m64] = IA32e (x86_64) ELF64 standard ABI +TUNECONFLICT[m64] = m32 +TUNE_ARCH .= ${@bb.utils.contains(TUNE_FEATURES, m64, x86_64, ,d)} +TUNE_CCARGS += ${@bb.utils.contains(TUNE_FEATURES, m64, -m64, , d)} + +# Default Tune configurations +AVAILTUNES += x86 +TUNE_FEATURES_tune-x86 ?= m32 +BASE_LIB_tune-x86 = lib +PACKAGE_EXTRA_ARCHS_tune-x86 = x86 + +AVAILTUNES += x86-64 +TUNE_FEATURES_tune-x86-64 ?= m64 +BASE_LIB_tune-x86-64 = lib64 +PACKAGE_EXTRA_ARCHS_tune-x86-64 = x86_64 \ No newline at end of file diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc new file mode 100644 index 000..f7f4eed --- a/dev/null +++ b/meta/conf/machine/include/mips/arch-mips.inc @@ -0,0 +1 @@ +TUNE_ARCH = mips diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc new file mode 100644 index 000..5ab81d4 --- a/dev/null +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc @@ -0,0 +1 @@ +TUNE_ARCH = powerpc diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc index c1d0c07..953f0dd 100644 --- a/meta/conf/machine/include/tune-arm1136jf-s.inc +++ b/meta/conf/machine/include/tune-arm1136jf-s.inc @@ -1,4 +1,4 @@ -TUNE_ARCH = arm +require conf/machine/include/arm/arch-arm.inc TUNE_CCARGS = -march=armv6j -mtune=arm1136jf-s TUNE_CCARGS += ${@['', '-mfloat-abi=softfp -mfpu=vfp'][(bb.data.getVar('TARGET_FPU', d, 1) == 'soft') and (bb.data.getVar('CPU_FEATURES', d, 1).find('vfp') != -1)]} diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc index 3f30e2a..6c87026 100644 --- a/meta/conf/machine/include/tune-arm920t.inc +++ b/meta/conf/machine/include/tune-arm920t.inc @@ -1,4 +1,4 @@ -TUNE_ARCH = arm +require conf/machine/include/arm/arch-arm.inc TUNE_PKGARCH = armv4t TUNE_CCARGS = -march=armv4t -mtune=arm920t diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc index 049f57c..543ab62 100644 ---
[OE-core] [PATCH 6/3] Move architecture specific TARGET_OS mangling into tune files
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 61312bc..6e109ec 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -85,9 +85,11 @@ TUNE_ARCH ??= INVALID TUNE_CCARGS ??= TUNE_FEATURES ??= ${TUNE_FEATURES_tune-${DEFAULTTUNE}} PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE} ??= ${TARGET_ARCH} +LIBCEXTENSION ??= +ABIEXTENSION ??= TARGET_ARCH = ${TUNE_ARCH} -TARGET_OS = INVALID +TARGET_OS = linux${LIBCEXTENSION}${ABIEXTENSION} TARGET_VENDOR = -oe TARGET_SYS = ${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} TARGET_PREFIX = ${TARGET_SYS}- diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc index 9fab4dc..8ef3ceb 100644 --- a/meta/conf/distro/include/tclibc-eglibc.inc +++ b/meta/conf/distro/include/tclibc-eglibc.inc @@ -2,10 +2,7 @@ # eglibc specific configuration # -TARGET_OS = linux -TARGET_OS_arm = linux-gnueabi -TARGET_OS_armeb = linux-gnueabi -TARGET_OS_powerpc = linux${@['','-gnuspe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]} +LIBCEXTENSION = ${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']} # Add glibc overrides to the overrides for eglibc. OVERRIDES .= :libc-glibc diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc index 0370dfa..823195c 100644 --- a/meta/conf/distro/include/tclibc-glibc.inc +++ b/meta/conf/distro/include/tclibc-glibc.inc @@ -2,10 +2,7 @@ # glibc specific configuration # -TARGET_OS = linux -TARGET_OS_arm = linux-gnueabi -TARGET_OS_armeb = linux-gnueabi -TARGET_OS_powerpc = linux${@['','-gnuspe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]} +LIBCEXTENSION = ${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']} # Add glibc to the overrides. OVERRIDES =. libc-glibc: diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc index 7c06654..e0f50a0 100644 --- a/meta/conf/distro/include/tclibc-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -2,10 +2,7 @@ # uclibc specific configuration # -TARGET_OS = linux-uclibc -TARGET_OS_arm = linux-uclibceabi -TARGET_OS_armeb = linux-uclibceabi -TARGET_OS_powerpc = linux-uclibc${@['','spe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]} +LIBCEXTENSION = -uclibc # Add uclibc overrides to the overrides. OVERRIDES =. libc-uclibc: diff --git a/meta/conf/machine/include/arm/arch-arm.inc b/meta/conf/machine/include/arm/arch-arm.inc index e773d14..c517df6 100644 --- a/meta/conf/machine/include/arm/arch-arm.inc +++ b/meta/conf/machine/include/arm/arch-arm.inc @@ -1 +1,3 @@ TUNE_ARCH = arm + +ABIEXTENSION = eabi diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc index 5ab81d4..17ace32 100644 --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc @@ -1 +1,3 @@ TUNE_ARCH = powerpc + +ABIEXTENSION = ${@['','spe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]} ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/3] conf/machine/include: Start to fill out architecture specific tune include files and tune features
On 07/22/2011 11:00 AM, Richard Purdie wrote: These changes revolve around the idea of tune features. These are represented by 'flag' strings that are included in the TUNE_FEATURES variable. Any string included in TUNE_FEATURES should also add a TUNEVALID[name] entry so we can know which flags are available in TUNE_FEATURES and have documentation about what the flags do. We will add sanity code to error if flags are listed in TUNE_FEATURES but are not documented in TUNEVALID. A given tune configuration will want to define one or more predetermined sets of _FEATURE flag lists. These are defined in the form TUNE_FEATURES_tune-name. For defined tune configuation, name should be added to the AVAILTUNE list so that we can determine what tune configurations are available. Flags cannot be used in this case as with TUNEVALID since its useful to be able to build up tune lists from other TUNE_FEATURES_tune-yyy options. A given tune configuration may also define PACKAGE_EXTRA_ARCHS_tune-name and BASE_LIB_tune-name to control the multilib location. All options can be overridden by the distro or local user configuration. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org As a specific nit, we can't use x86_64 in OVERRIDES (using the normal mechanism need base_contains(...). Can we switch to calling it amd64 ala Debian/Ubuntu? Aside from that, as I told Mark the other day, this looks good to me. -- Tom Rini Mentor Graphics Corporation ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Mutltilib patch status
I'm not as far advanced as I'd like to have been with the multilib patches today but I've posted out the current cleaned up patches I have to give an idea of where things are heading. I appended them to the previous three patches I sent out and believe those patches so far so stand on their own merit. The complete series of my cleanup work so far are available at: http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=rpurdie/ml3 and you can enable multilib with lines like: require conf/multilib.conf MULTILIBS = multilib:lib32 multilib:lib64 DEFAULTTUNE_virtclass-multilib-lib32 = i586 DEFAULTTUNE_virtclass-multilib-lib64 = x86-64 in local.conf. I've completed the ia32 tune files, I have not handled arm/mips/powerpc yet. I've used a slightly improved formatting from Mark's version and included more information in the commit messages to help people understand the changes. I've included two of Paul's bitbake BBCLASSEXTEND fixes in the series for completeness. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/3] bitbake.conf/classes: Variable cleanup
This patch removes the variables BASE_PACKAGE_ARCH, BASEPKG_HOST_SYS, BASEPKG_TARGET_SYS and also removes the immediate assignments in several core classes as these are no longer required. This should make it clearer what some of the core variables do and simplfy some overly complex and confusing class code. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass index e3ac392..26fca70 100644 --- a/meta/classes/allarch.bbclass +++ b/meta/classes/allarch.bbclass @@ -2,7 +2,6 @@ # This class is used for architecture independent recipes/data files (usally scripts) # -BASE_PACKAGE_ARCH = all PACKAGE_ARCH = all # No need for virtual/libc or a cross compiler diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index edd51da..c878d7f 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -9,15 +9,12 @@ # or indirectly via dependency. No need to be in 'world'. EXCLUDE_FROM_WORLD = 1 -STAGING_BINDIR_TOOLCHAIN = ${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${OLD_BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS} +STAGING_BINDIR_TOOLCHAIN = ${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} # # Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS # -OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} -OLD_MULTIMACH_TARGET_SYS := ${MULTIMACH_TARGET_SYS} -OLD_BASE_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH} -BASE_PACKAGE_ARCH = ${SDK_ARCH}-nativesdk +PACKAGE_ARCH = ${SDK_ARCH}-nativesdk python () { archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split() sdkarchs = [] @@ -66,12 +63,12 @@ target_exec_prefix := ${exec_prefix} base_prefix = ${SDKPATHNATIVE} prefix = ${SDKPATHNATIVE}${prefix_nativesdk} exec_prefix = ${SDKPATHNATIVE}${prefix_nativesdk} -bindir = ${exec_prefix}/bin/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS} +bindir = ${exec_prefix}/bin/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} sbindir = ${bindir} base_bindir = ${bindir} base_sbindir = ${bindir} -libdir = ${exec_prefix}/lib/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS} -libexecdir = ${exec_prefix}/libexec/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS} +libdir = ${exec_prefix}/lib/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} +libexecdir = ${exec_prefix}/libexec/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} FILES_${PN} = ${prefix} FILES_${PN}-dbg += ${prefix}/.debug \ diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index 81358ec..050d63e 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -4,14 +4,6 @@ inherit relocatable # no need for them to be a direct target of 'world' EXCLUDE_FROM_WORLD = 1 -# Save PACKAGE_ARCH before changing HOST_ARCH -OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} -PACKAGE_ARCH = ${OLD_PACKAGE_ARCH} -# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it -OLD_BASE_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH} -BASE_PACKAGE_ARCH = ${OLD_BASE_PACKAGE_ARCH} -BASEPKG_HOST_SYS = ${HOST_ARCH}${HOST_VENDOR}-${HOST_OS} - PACKAGES = HOST_ARCH = ${BUILD_ARCH} @@ -20,10 +12,10 @@ HOST_OS = ${BUILD_OS} HOST_PREFIX = ${BUILD_PREFIX} HOST_CC_ARCH = ${BUILD_CC_ARCH} -STAGING_DIR_HOST = ${STAGING_DIR}/${BASEPKG_HOST_SYS} +STAGING_DIR_HOST = ${STAGING_DIR}/${HOST_ARCH}${HOST_VENDOR}-${HOST_OS} -export PKG_CONFIG_DIR = ${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${libdir}/pkgconfig -export PKG_CONFIG_SYSROOT_DIR = ${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS} +export PKG_CONFIG_DIR = ${STAGING_DIR}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${libdir}/pkgconfig +export PKG_CONFIG_SYSROOT_DIR = ${STAGING_DIR}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} CPPFLAGS = ${BUILD_CPPFLAGS} CFLAGS = ${BUILD_CFLAGS} diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index 3952ebd..a2e5a22 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -1,8 +1,8 @@ inherit cross -BASE_PACKAGE_ARCH = ${SDK_ARCH} -PACKAGE_ARCH = ${BASE_PACKAGE_ARCH} +PACKAGE_ARCH = ${SDK_ARCH} STAGING_DIR_TARGET = ${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS} +STAGING_BINDIR_TOOLCHAIN = ${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS} TARGET_ARCH = ${SDK_ARCH} TARGET_VENDOR = ${SDK_VENDOR} diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 1e8de95..00f7b9f 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -15,10 +15,6 @@ PACKAGE_ARCH = ${BUILD_ARCH} OECMAKE_RPATH = ${libdir} OECMAKE_RPATH_virtclass-native = ${libdir} -BASE_PACKAGE_ARCH = ${BUILD_ARCH} -BASEPKG_HOST_SYS = ${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS} -BASEPKG_TARGET_SYS = ${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS} - # When this
[OE-core] [PATCH 1/3] openjade-native: Add SYSROOT_PREPROCESS_FUNC
[YOCTO #1250] This added function will install a private install-catalog binary so that shared state can find the binary as there is not a guarantee. Signed-off-by: Saul Wold s...@linux.intel.com --- .../openjade/openjade-native_1.3.2.bb | 12 ++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb index 1c672e1..3922968 100644 --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb @@ -7,7 +7,7 @@ SECTION = base LICENSE = BSD LIC_FILES_CHKSUM = file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045 -PR = r2 +PR = r3 DEPENDS = opensp-native sgml-common-native RDEPENDS_${PN} = sgml-common @@ -31,6 +31,8 @@ CONFIGUREOPTS := ${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadi CFLAGS =+ -I${S}/include SSTATEPOSTINSTFUNCS += openjade_sstate_postinst +SYSROOT_PREPROCESS_FUNCS += openjade_sysroot_preprocess + # We need to do this else the source interdependencies aren't generated and # build failures can result (e.g. zero size style/Makefile.dep file) @@ -66,8 +68,14 @@ openjade_sstate_postinst() { then # Ensure that the catalog file sgml-docbook.cat is properly # updated when the package is installed from sstate cache. - install-catalog \ + ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \ --add ${sysconfdir}/sgml/sgml-docbook.cat \ ${sysconfdir}/sgml/openjade-${PV}.cat fi } + +docbook_sgml_dtd_sysroot_preprocess () { +install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ +install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade +} + -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] docbook-dsssl-stylesheets-native: Add SYSROOT_PREPROCESS_FUNC
[YOCTO #1250] This added function will install a private install-catalog binary so that shared state can find the binary as there is not a guarantee. Signed-off-by: Saul Wold s...@linux.intel.com --- .../docbook-dsssl-stylesheets-native_1.79.bb | 12 ++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb index 88d24dd..a776ea5 100644 --- a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb +++ b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = file://README;beginline=41;endline=74;md5=875385159b2ee76ecf DEPENDS = sgml-common-native -PR = r2 +PR = r3 SRC_URI = ${SOURCEFORGE_MIRROR}/docbook/docbook-dsssl-${PV}.tar.bz2 @@ -19,6 +19,8 @@ S = ${WORKDIR}/docbook-dsssl-${PV} inherit native SSTATEPOSTINSTFUNCS += docbook_dsssl_stylesheets_sstate_postinst +SYSROOT_PREPROCESS_FUNCS += docbook_dsssl_sysroot_preprocess + do_install () { # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html @@ -42,8 +44,14 @@ docbook_dsssl_stylesheets_sstate_postinst () { then # Ensure that the catalog file sgml-docbook.cat is properly # updated when the package is installed from sstate cache. - install-catalog \ + ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl \ --add ${sysconfdir}/sgml/sgml-docbook.cat \ ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat fi } + +docbook_dsssl_sysroot_preprocess () { +install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ +install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl +} + -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] docbook-sgml-dtd-native: Add SYSROOT_PREPROCESS_FUNC
[YOCTO #1250] This added function will install a private install-catalog binary so that shared state can find the binary as there is not a guarantee. Signed-off-by: Saul Wold s...@linux.intel.com --- .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc | 11 +-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc index ede7bb1..542600a 100644 --- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc +++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc @@ -20,9 +20,10 @@ SRC_URI = http://www.docbook.org/sgml/${DTD_VERSION}/docbook-${DTD_VERSION}.zip # The .zip file extracts to the current dir S = ${WORKDIR} -INC_PR = r1 +INC_PR = r2 SSTATEPOSTINSTFUNCS += docbook_sgml_dtd_sstate_postinst +SYSROOT_PREPROCESS_FUNCS += docbook_sgml_dtd_sysroot_preprocess inherit native @@ -43,8 +44,14 @@ docbook_sgml_dtd_sstate_postinst () { then # Ensure that the catalog file sgml-docbook.cat is properly # updated when the package is installed from sstate cache. - install-catalog \ + ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-sgml-dtd-${DTD_VERSION} \ --add ${sysconfdir}/sgml/sgml-docbook.cat \ ${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat fi } + +docbook_sgml_dtd_sysroot_preprocess () { +install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ +install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-sgml-dtd-${DTD_VERSION} +} + -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] openjade-native: Add SYSROOT_PREPROCESS_FUNC
On Fri, 2011-07-22 at 16:54 -0700, Saul Wold wrote: [YOCTO #1250] This added function will install a private install-catalog binary so that shared state can find the binary as there is not a guarantee. Signed-off-by: Saul Wold s...@linux.intel.com --- .../openjade/openjade-native_1.3.2.bb | 12 ++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb index 1c672e1..3922968 100644 --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb @@ -7,7 +7,7 @@ SECTION = base LICENSE = BSD LIC_FILES_CHKSUM = file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045 -PR = r2 +PR = r3 DEPENDS = opensp-native sgml-common-native RDEPENDS_${PN} = sgml-common @@ -31,6 +31,8 @@ CONFIGUREOPTS := ${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadi CFLAGS =+ -I${S}/include SSTATEPOSTINSTFUNCS += openjade_sstate_postinst +SYSROOT_PREPROCESS_FUNCS += openjade_sysroot_preprocess + # We need to do this else the source interdependencies aren't generated and # build failures can result (e.g. zero size style/Makefile.dep file) @@ -66,8 +68,14 @@ openjade_sstate_postinst() { then # Ensure that the catalog file sgml-docbook.cat is properly # updated when the package is installed from sstate cache. - install-catalog \ + ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \ --add ${sysconfdir}/sgml/sgml-docbook.cat \ ${sysconfdir}/sgml/openjade-${PV}.cat fi } + +docbook_sgml_dtd_sysroot_preprocess () { This is not the same function name as above... +install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ +install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade +} + -- Joshua Lock Yocto Project Johannes factotum Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Fix for share state native binary issue
Richard, This fixes the install-catalog issue with shared state native dependencies. This is the point fix, it does not address the underlying issue which will take more work and time. Sau! The following changes since commit b4c23fce3eadaff8fc621d38759d493cd03cc131: consolekit 0.4.5: fix PAM installation dir (2011-07-22 11:56:42 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/fix http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix Saul Wold (3): openjade-native: Add SYSROOT_PREPROCESS_FUNC docbook-sgml-dtd-native: Add SYSROOT_PREPROCESS_FUNC docbook-dsssl-stylesheets-native: Add SYSROOT_PREPROCESS_FUNC .../docbook-dsssl-stylesheets-native_1.79.bb | 12 ++-- .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc | 11 +-- .../openjade/openjade-native_1.3.2.bb | 12 ++-- 3 files changed, 29 insertions(+), 6 deletions(-) -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] runqemu bugfix
This fixes an issue Jessica Zhang reported to me today: Invoking runqemu outside of the build directory for an in-tree setup results in an empty TMPDIR because bitbake -e cannot be run to find it. A symptom of this problem is running runqemu and getting the following error: Error: Unable to find tunctl binary in directory Catch this case and report the error to the user. This fixes [YOCTO #1278] The following changes since commit eea4bd731ef286516ee1fb934fea09c06e70: mpc8315e-rdb: Set TARGET_FPU correct (2011-07-22 09:02:58 -0700) are available in the git repository at: git://git.pokylinux.org/poky-contrib sgarman/runqemu-fix http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/runqemu-fix Scott Garman (1): runqemu: report error if TMPDIR cannot be determined scripts/runqemu | 27 --- 1 files changed, 16 insertions(+), 11 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] runqemu: report error if TMPDIR cannot be determined
Invoking runqemu outside of the build directory for an in-tree setup results in an empty TMPDIR because bitbake -e cannot be run to find it. A symptom of this problem is running runqemu and getting the following error: Error: Unable to find tunctl binary in directory Catch this case and report the error to the user. This fixes [YOCTO #1278] Signed-off-by: Scott Garman scott.a.gar...@intel.com --- scripts/runqemu | 27 --- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 5aed25a..dacaf7c 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -272,22 +272,27 @@ setup_tmpdir() { # We have bitbake in PATH, get TMPDIR from bitbake TMPDIR=`bitbake -e | grep TMPDIR=\ | cut -d '=' -f2 | cut -d '' -f2` +if [ -z $TMPDIR ]; then +echo Error: this script needs to be run from your build directory, +echo or you need to explicitly set TMPDIR in your environment +exit 1 +fi fi } setup_sysroot() { - # Toolchain installs set up $OECORE_NATIVE_SYSROOT in their - # environment script. If that variable isn't set, we're - # either in an in-tree build scenario or the environment - # script wasn't source'd. - if [ -z $OECORE_NATIVE_SYSROOT ]; then - setup_tmpdir - BUILD_ARCH=`uname -m` - BUILD_OS=`uname | tr '[A-Z]' '[a-z]'` - BUILD_SYS=$BUILD_ARCH-$BUILD_OS - - OECORE_NATIVE_SYSROOT=$TMPDIR/sysroots/$BUILD_SYS - fi +# Toolchain installs set up $OECORE_NATIVE_SYSROOT in their +# environment script. If that variable isn't set, we're +# either in an in-tree build scenario or the environment +# script wasn't source'd. +if [ -z $OECORE_NATIVE_SYSROOT ]; then +setup_tmpdir +BUILD_ARCH=`uname -m` +BUILD_OS=`uname | tr '[A-Z]' '[a-z]'` +BUILD_SYS=$BUILD_ARCH-$BUILD_OS + +OECORE_NATIVE_SYSROOT=$TMPDIR/sysroots/$BUILD_SYS +fi } # Locate a rootfs image based on defaults defined above -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] libxcb: Add missing DEPENDS on libxdmcp
Observed this to fail when populating new tmpdir from shared state Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/recipes-graphics/xcb/libxcb_1.7.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xcb/libxcb_1.7.bb b/meta/recipes-graphics/xcb/libxcb_1.7.bb index 0f30c88..daecf0f 100644 --- a/meta/recipes-graphics/xcb/libxcb_1.7.bb +++ b/meta/recipes-graphics/xcb/libxcb_1.7.bb @@ -3,9 +3,9 @@ include libxcb.inc LICENSE = MIT LIC_FILES_CHKSUM = file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 -PR = r1 +PR = r2 -DEPENDS += libpthread-stubs xcb-proto-native +DEPENDS += libpthread-stubs xcb-proto-native libxdmcp PACKAGES =+ libxcb-xinerama -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] siteinfo: Rework the siteinfo for powerpc to fix uclibc fallout
I believe that powerpc-linux is now a common file across 32bit/64bit linux for powerpc be it uclibc or glibc. I compared the differences between powerpc-linux-uclibc and powerpc-linux files and it powerpc-linux was more uptodate and all the new stuff it had was needed for uclibc anyway so we do not need to keep exact copy of powerpc-linux as powerpc-linux-uclibc instead we use powerpc-linux for powerpc/uclibc targets. Secondly linux specific files were added in archinfo dictionary which I think logically belongs to targetinfo dictionary therefore moved them to targetinfo now uclibc/powerpc is buildable again Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/classes/siteinfo.bbclass | 16 ++-- 1 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 meta/site/powerpc-linux-uclibc diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index c5308b3..056c519 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -33,11 +33,11 @@ def siteinfo_data(d): mips64: endian-big bit-64 mips64-common, mips64el: endian-little bit-64 mips64-common, mipsel: endian-little bit-32 mips-common, -powerpc: endian-big bit-32 powerpc-common powerpc32-linux, +powerpc: endian-big bit-32 powerpc-common, nios2: endian-little bit-32 nios2-common, -powerpc64: endian-big bit-64 powerpc-common powerpc-linux powerpc64-linux, -ppc: endian-big bit-32 powerpc-common powerpc32-linux, -ppc64: endian-big bit-64 powerpc-common powerpc-linux powerpc64-linux, +powerpc64: endian-big bit-64 powerpc-common, +ppc: endian-big bit-32 powerpc-common, +ppc64: endian-big bit-64 powerpc-common, sh3: endian-little bit-32 sh-common, sh4: endian-little bit-32 sh-common, sparc: endian-big bit-32, @@ -62,8 +62,12 @@ def siteinfo_data(d): arm-linux-uclibceabi: arm-linux-uclibc, armeb-linux-gnueabi: armeb-linux, armeb-linux-uclibceabi: armeb-linux-uclibc, -powerpc-linux-gnuspe: powerpc-linux, -powerpc-linux-uclibcspe: powerpc-linux-uclibc, +powerpc-linux: powerpc32-linux, +powerpc-linux-uclibc: powerpc-linux powerpc32-linux, +powerpc-linux-gnuspe: powerpc-linux powerpc32-linux, +powerpc-linux-uclibcspe: powerpc-linux powerpc32-linux powerpc-linux-uclibc, +powerpc64-linux-gnuspe: powerpc-linux powerpc64-linux, +powerpc64-linux: powerpc-linux, } hostarch = d.getVar(HOST_ARCH, True) diff --git a/meta/site/powerpc-linux-uclibc b/meta/site/powerpc-linux-uclibc deleted file mode 100644 index e69de29..000 -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] openjade-native: Add SYSROOT_PREPROCESS_FUNC
On 07/22/2011 04:57 PM, Joshua Lock wrote: On Fri, 2011-07-22 at 16:54 -0700, Saul Wold wrote: [YOCTO #1250] This added function will install a private install-catalog binary so that shared state can find the binary as there is not a guarantee. Signed-off-by: Saul Wolds...@linux.intel.com --- .../openjade/openjade-native_1.3.2.bb | 12 ++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb index 1c672e1..3922968 100644 --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb @@ -7,7 +7,7 @@ SECTION = base LICENSE = BSD LIC_FILES_CHKSUM = file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045 -PR = r2 +PR = r3 DEPENDS = opensp-native sgml-common-native RDEPENDS_${PN} = sgml-common @@ -31,6 +31,8 @@ CONFIGUREOPTS := ${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadi CFLAGS =+ -I${S}/include SSTATEPOSTINSTFUNCS += openjade_sstate_postinst +SYSROOT_PREPROCESS_FUNCS += openjade_sysroot_preprocess + # We need to do this else the source interdependencies aren't generated and # build failures can result (e.g. zero size style/Makefile.dep file) @@ -66,8 +68,14 @@ openjade_sstate_postinst() { then # Ensure that the catalog file sgml-docbook.cat is properly # updated when the package is installed from sstate cache. - install-catalog \ + ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \ --add ${sysconfdir}/sgml/sgml-docbook.cat \ ${sysconfdir}/sgml/openjade-${PV}.cat fi } + +docbook_sgml_dtd_sysroot_preprocess () { This is not the same function name as above... Good catch on Johsua's part, Bad on my part for not completing testing before sending this out. I had a build going before I send the pull request. Thanks Sau! +install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ +install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade +} + ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core