denzil pull request1
cover denzil pull request1
Hello,
This is my first pull request for denzil since the 1.2.1 release was made.
It has been run through the autobuilder, which is having some issues with running sanity tests and buildhistory, so if the build succeeded for everything except for those steps, I note it as "Green with known AB issues" below.
Note that these tests were run with a poky-based branch.
Autobuilder Test Report: sgarman/denzil-next-pull1
eclipse-plugin: Green
http://autobuilder.yoctoproject.org:8010/builders/eclipse-plugin/builds/491
nightly-x86: Green with known AB issues
http://autobuilder.yoctoproject.org:8010/builders/nightly-x86/builds/633
nightly-x86-64: Green with known AB issues
http://autobuilder.yoctoproject.org:8010/builders/nightly-x86-64/builds/572
nightly-arm: Red: see below
http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/571
connman-gnome do_configure failed
configure: error: dbus-glib > = 0.73 is required
nightly-mips: Green with known AB issues
http://autobuilder.yoctoproject.org:8010/builders/nightly-mips
nightly-ppc: Green with known AB issues
http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc/builds/527
nightly-world: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-world/builds/221
nightly-non-gpl3: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/204
nightly-multilib: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-multilib/builds/205
nightly-tiny: Green
http://autobuilder.yoctoproject.org:8010/builders/nightly-tiny/builds/185
Scott
The following changes since commit 741146fa90f28f7ce8d82ee7f7e254872d519724:
gconf.bbclass: don't register schemas in the install stage (2012-06-29 15:03:01 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgarman/denzil-next-pull1
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgarman/denzil-next-pull1
Enrico Scholz (1):
libtool: fixed parallel build related race
Khem Raj (1):
xserver-xorg: Fix build on powerpc
Martin Donnelly (1):
augeas: Add libxml2 dependency
Matthew McClintock (12):
libxml-parser-perl_2.41.bb: fix MakeMaker issues with using wrong
CC/LD/etc
qemu-0.15.1: add patch to fix compilatation problems on powerpc packagedata.py: Fix get_subpkgedata_fn for multilib dtc.inc: fix for libdir == /usr/lib64 openjade-native_1.3.2.bb: fix typo and change the deps exclusion to
correct var
gcc-configure-common.inc: use --with-long-double-128 on powerpc to
comply with ABI
gcc: gcc-cross-canadian: use correct location for libraries for
powerpc64
libgomp: add libgomp (openmp) library, and build for powerpc targets
by default
sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to
be defined
gcc-package-runtime.inc: Fix QA warning task-core-tools-testapps.bb: kexec-tools does not work on e5500-64b
parts
u-boot.inc: update linker arguments to pass --sysroot arg
Nitin A Kamble (1):
tcl: fix target recipe build issue on older distros
Otavio Salvador (2):
shadow-native: use 'users' group by default
shadow: use 'users' group by default
Paul Eggleton (4):
classes/rootfs_*: fix splitting package dependency strings
buildhistory_analysis: fix error when version specifier missing scripts/buildhistory-diff: add GitPython version check classes/license: fix manifest to work with deb
Richard Purdie (1):
utils.bbclass: add helper function to add all multilib variants of a
specific package
Saul Wold (4):
xinetd: Update to 2.3.15
curl: enable ssl support
curl: Use gnutls for target and openssl for native
foomatic: fix perl path for target
Scott Garman (1):
kernel.bbclass: Copy bounds.h only if it exists, needed for 2.6.x.
Ting Liu (2):
lsof: define linux C library type when using eglibc image_types.bbclass: redefine EXTRA_IMAGECMD_jffs2 to leverage
siteinfo
Zhenhua Luo (2):
linux-dtb: add multi-dtb build support task-core-sdk.bb: add libgomp and libgomp-dev by RECOMMENDS
meta/classes/image_types.bbclass | 7 +-
meta/classes/kernel.bbclass | 5 +
meta/classes/license.bbclass | 2 +-
meta/classes/rootfs_deb.bbclass | 4 +-
meta/classes/rootfs_ipk.bbclass | 4 +-
meta/classes/utils.bbclass | 9 ++
meta/lib/oe/buildhistory_analysis.py | 2 +-
meta/lib/oe/packagedata.py | 8 ++
meta/recipes-bsp/u-boot/u-boot.inc | 2 +-
meta/recipes-bsp/u-boot/u-boot_2011.03.bb | 2 +-
meta/recipes-bsp/u-boot/u-boot_2011.06.bb | 2 +-
.../sysvinit/sysvinit-inittab_2.88dsf.bb | 22 +++-
meta/recipes-core/tasks/task-core-sdk.bb | 6 +-
.../recipes-core/tasks/task-core-tools-testapps.bb | 1 +
meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +-
meta/recipes-devtools/gcc/gcc-configure-common.inc | 4 +
.../recipes-devtools/gcc/gcc-configure-runtime.inc | 7 ++
.../recipes-devtools/gcc/gcc-cross-canadian_4.6.bb | 4 +-
meta/recipes-devtools/gcc/gcc-package-runtime.inc | 13 +++
meta/recipes-devtools/libtool/libtool-2.4.2.inc | 3 +-
.../openjade/openjade-native_1.3.2.bb | 2 +-
.../perl/libxml-parser-perl_2.41.bb | 11 +-
.../qemu-0.15.1/0001-ppc64-Fix-linker-script.patch | 46 +++++++++
meta/recipes-devtools/qemu/qemu_0.15.1.bb | 3 +-
.../tcl/fix_issue_with_old_distro_glibc.patch | 109 ++++++++++++++++++++
meta/recipes-devtools/tcltk/tcl_8.5.11.bb | 5 +-
meta/recipes-extended/augeas/augeas.inc | 2 +-
.../foomatic/foomatic-filters_4.0.7.bb | 3 +-
meta/recipes-extended/lsof/lsof_4.85.bb | 7 +-
.../shadow/shadow-native_4.1.4.3.bb | 5 +-
meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 5 +-
.../xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb} | 6 +-
.../xorg-xserver/xserver-xorg-1.11.2.inc | 9 +-
.../xserver-xorg-1.11.2/gcc-47-warning.patch | 33 ++++++
meta/recipes-kernel/dtc/dtc.inc | 4 +-
meta/recipes-kernel/linux/linux-dtb.inc | 36 +++++--
meta/recipes-support/curl/curl_7.24.0.bb | 11 +-
scripts/buildhistory-diff | 8 +-
38 files changed, 362 insertions(+), 52 deletions(-)
create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/0001-ppc64-Fix-linker-script.patch
create mode 100644 meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
rename meta/recipes-extended/xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb} (90%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patchSignature · 1 line
1.7.9.5
PATCH 1/32 xinetd: Update to 2.3.15
From: Saul Wold <[email protected]>
---
.../xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb} (90%)meta/recipes-extended/xinetd/xinetd_2.3.15.bb renamed from meta/recipes-extended/xinetd/xinetd_2.3.14.bb +3 -3
@@ -7,7 +7,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8" DEPENDS = "" -PR ="r1" +PR = "r0" SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ file://xinetd.init \
@@ -17,8 +17,8 @@ SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ file://xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch \ " -SRC_URI[md5sum] = "567382d7972613090215c6c54f9b82d9" -SRC_URI[sha256sum] = "760e0e617c609a0509ef63fc7e9580d2f1d88c6113bb6d63273de7de7cd0bc1f" +SRC_URI[md5sum] = "77358478fd58efa6366accae99b8b04c" +SRC_URI[sha256sum] = "bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3" inherit autotools update-rc.d
Signature · 1 line
1.7.9.5
PATCH 2/32 linux-dtb: add multi-dtb build support
In reply to Scott GarmanFrom: Zhenhua Luo <[email protected]>
including following enhancement:
* support multi-dtb build
* skip dtb build and install when KERNEL_DEVICETREE is empty
* print a warning message when specified dts file is not available
--- meta/recipes-kernel/linux/linux-dtb.inc | 36 +++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 7 deletions(-)
meta/recipes-kernel/linux/linux-dtb.inc +29 -7
@@ -15,13 +15,35 @@ python __anonymous () { do_install_append() { if test -n "${KERNEL_DEVICETREE}"; then - dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree ${KERNEL_DEVICETREE} - install -m 0644 devicetree ${D}/boot/devicetree-${KERNEL_VERSION} - install -d ${DEPLOYDIR} - install -m 0644 devicetree ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.dtb - cd ${DEPLOYDIR} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb + for DTS_FILE in ${KERNEL_DEVICETREE}; do + if [ ! -f ${DTS_FILE} ]; then + echo "Warning: ${DTS_FILE} is not available!" + continue + fi + DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` + DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"` + DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"` + dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DTS_BASE_NAME} ${DTS_FILE} + install -m 0644 ${DTS_BASE_NAME} ${D}/boot/devicetree-${DTB_SYMLINK_NAME}.dtb + done fi } +do_deploy_append() { + if test -n "${KERNEL_DEVICETREE}"; then + for DTS_FILE in ${KERNEL_DEVICETREE}; do + if [ ! -f ${DTS_FILE} ]; then + echo "Warning: ${DTS_FILE} is not available!" + continue + fi + DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` + DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"` + DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTS_BASE_NAME}/g"` + install -d ${DEPLOYDIR} + install -m 0644 ${B}/${DTS_BASE_NAME} ${DEPLOYDIR}/${DTB_NAME}.dtb + cd ${DEPLOYDIR} + ln -sf ${DTB_NAME}.dtb ${DTB_SYMLINK_NAME}.dtb + cd - + done + fi +}
Signature · 1 line
1.7.9.5
PATCH 3/32 libxml-parser-perl_2.41.bb: fix MakeMaker issues with using wrong CC/LD/etc
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
MakeMaker has a bug where it does not propagate CC/LD/etc information down to subproject it generates Makefiles for... this recipe has has an Expat subproject which has issues building if we are using sstate-cache and it will reference the old sysroots and be unable to build properly. There is an upstream MakeMaker bug for this issue but we can work around it by fixing up the Makefiles for now
See:
https://rt.cpan.org/Public/Bug/Display.html?id=28632
--- .../perl/libxml-parser-perl_2.41.bb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb +9 -2
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e DEPENDS += "expat expat-native" -PR = "r2" +PR = "r3" SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz" SRC_URI[md5sum] = "c320d2ffa459e6cdc6f9f59c1185855e"
@@ -13,10 +13,17 @@ SRC_URI[sha256sum] = "b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740 S = "${WORKDIR}/XML-Parser-${PV}" -EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" +EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR} CC=${CC} LD=${LD} FULL_AR=${AR}" inherit cpan +# fix up sub MakeMaker project as arguments don't get propagated though +# see https://rt.cpan.org/Public/Bug/Display.html?id=28632 +do_configure_append() { + sed 's:--sysroot=.*\(\s\|$\):--sysroot=${STAGING_DIR_TARGET} :g' -i Makefile Expat/Makefile + sed 's:^FULL_AR = .*:FULL_AR = ${AR}:g' -i Expat/Makefile +} + do_compile() { export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')" cpan_do_compile
Signature · 1 line
1.7.9.5
PATCH 4/32 qemu-0.15.1: add patch to fix compilatation problems on powerpc
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
ERROR: Function failed: do_compile (see /opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/work/ppc64e5500-fsl-linux/qemu-0.15.1-r6/temp/log.do_compile.28447 for further information)
ERROR: Logfile of failure stored in: /opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/work/ppc64e5500-fsl-linux/qemu-0.15.1-r6/temp/log.do_compile.28447 Log data follows:
| DEBUG: SITE files ['endian-big', 'bit-64', 'powerpc-common', 'common-linux', 'common-glibc', 'powerpc-linux', 'powerpc64-linux', 'common'] | ERROR: Function failed: do_compile (see /opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/work/ppc64e5500-fsl-linux/qemu-0.15.1-r6/temp/log.do_compile.28447 for further information) | NOTE: make -j 24 | LINK ppc-linux-user/qemu-ppc | /opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/sysroots/x86_64-linux/usr/libexec/ppc64e5500-fsl-linux/gcc/powerpc64-fsl-linux/4.6.4/ld:/opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/work/ppc64e5500-fsl-linux/qemu-0.15.1-r6/qemu-0.15.1/ppc64.ld:84: syntax error | collect2: ld returned 1 exit status | make[1]: *** [qemu-ppc] Error 1 | make: *** [subdir-ppc-linux-user] Error 2 | make: *** Waiting for unfinished jobs.... | ERROR: oe_runmake failed
--- .../qemu-0.15.1/0001-ppc64-Fix-linker-script.patch | 46 ++++++++++++++++++++ meta/recipes-devtools/qemu/qemu_0.15.1.bb | 3 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/0001-ppc64-Fix-linker-script.patch
meta/recipes-devtools/qemu/qemu-0.15.1/0001-ppc64-Fix-linker-script.patch new file +46 -0
@@ -0,0 +1,46 @@ +Upstream-Status: Backport + +From 7c0a3409627604c111d5c5e1ce4e0224c2b56315 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <[email protected]> +Date: Tue, 4 Oct 2011 05:14:52 +0000 +Subject: [PATCH] ppc64: Fix linker script +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since commit 8733f609 (Fix linker scripts) linking on Linux/ppc64 fails: + + LINK ppc64-linux-user/qemu-ppc64 +/usr/lib64/gcc/powerpc64-suse-linux/4.3/../../../../powerpc64-suse-linux/bin/ld:/home/afaerber/qemu/ppc64.ld:84: syntax error +collect2: ld gab 1 als Ende-Status zurück +make[1]: *** [qemu-ppc64] Fehler 1 +make: *** [subdir-ppc64-linux-user] Fehler 2 + +Fix by removing a leftover line in the ppc64 linker script. + +Cc: Gerd Hoffmann <[email protected]> +Cc: Blue Swirl <[email protected]> +Signed-off-by: Andreas Färber <[email protected]> +Signed-off-by: Alexander Graf <[email protected]> +--- + ppc64.ld | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ppc64.ld b/ppc64.ld +index 0059ee5..0a7c0dd 100644 +--- a/ppc64.ld ++++ b/ppc64.ld +@@ -81,8 +81,8 @@ SECTIONS + .sdata2 : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } + .sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } + .eh_frame_hdr : { *(.eh_frame_hdr) } +-*(.gcc_except_table.*) } /* Adjust the address for the data segment. We want to +-adjust up to + the same address within the page on the next page up. */ ++ /* Adjust the address for the data segment. We want to adjust up to ++ the same address within the page on the next page up. */ + . = ALIGN (0x10000) - ((0x10000 - .) & (0x10000 - 1)); . = DATA_SEGMENT_ALIGN + (0x10000, 0x1000); /* Exception handling */ + .eh_frame : { KEEP (*(.eh_frame)) } +-- +1.7.10 +
meta/recipes-devtools/qemu/qemu_0.15.1.bb +2 -1
@@ -3,7 +3,7 @@ require qemu.inc LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -PR = "r6" +PR = "r7" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" FILESDIR = "${WORKDIR}"
@@ -19,6 +19,7 @@ SRC_URI = "\ file://larger_default_ram_size.patch \ file://arm-bgr.patch \ file://a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch \ + file://0001-ppc64-Fix-linker-script.patch \ " # Only use the GL passthrough patches for native/nativesdk versions
Signature · 1 line
1.7.9.5
PATCH 5/32 packagedata.py: Fix get_subpkgedata_fn for multilib
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
This happens when tryng to add libgcc-dev to as a multilib package (e.g. IMAGE_INSTALL_append = " lib32-libgcc-dev")
| Processing task-core-boot... | Processing fman-ucode... | Processing dosfstools... | Processing lib32-libgcc-dev... | Unable to find package lib32-libgcc-dev (libgcc-dev)!
NOTE: package fsl-image-full-1.0-r1.1.3.6: task do_rootfs: Failed
RPM (or bitbake?) is looking in the tmp/pkgdata, however some of these file paths are mungned for the multilib scenario:
$ find tmp/pkgdata/ | grep libgcc-dev$ tmp/pkgdata/ppce5500-fsl-linux/runtime/lib32-libgcc-dev tmp/pkgdata/ppc64e5500-fsl-linux/runtime/libgcc-dev
This patch fixes where we look for these files so they can be found and properly installed for the multilib root file system
--- meta/lib/oe/packagedata.py | 8 ++++++++ 1 file changed, 8 insertions(+)
meta/lib/oe/packagedata.py +8 -0
@@ -27,6 +27,14 @@ def read_pkgdatafile(fn): def get_subpkgedata_fn(pkg, d): archs = d.expand("${PACKAGE_ARCHS}").split(" ") + mlarchs = d.getVar("MULTILIB_PACKAGE_ARCHS", d) or None + + if mlarchs: + for mlarch in mlarchs.split(" "): + if "_" in mlarch: + prefix, split, new_arch = mlarch.partition("_") + archs.append(new_arch) + archs.reverse() pkgdata = d.expand('${TMPDIR}/pkgdata/') targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/')
Signature · 1 line
1.7.9.5
PATCH 6/32 dtc.inc: fix for libdir == /usr/lib64
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
On 64bit systems dtc will still install libaries in /usr/lib unless we havet this override
--- meta/recipes-kernel/dtc/dtc.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/dtc/dtc.inc +2 -2
@@ -10,8 +10,8 @@ SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \ file://make_install.patch \ " -EXTRA_OEMAKE='PREFIX="${prefix}"' -INC_PR = "r2" +EXTRA_OEMAKE='PREFIX="${prefix}" LIBDIR="${libdir}"' +INC_PR = "r3" S = "${WORKDIR}/git"
Signature · 1 line
1.7.9.5
PATCH 7/32 openjade-native_1.3.2.bb: fix typo and change the deps exclusion to correct var
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
--- .../openjade/openjade-native_1.3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +1 -1
@@ -32,7 +32,7 @@ CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadi # CONFIGUREOPTS has hard coded paths so we need to ignore it's vardeps # there are other bits in there too but they are picked up by other variable # dependencies so it all works out -do_configure[vardepsexclude] += "CONNFIGUREOPTS" +oe_runconf[vardepsexclude] += "CONFIGUREOPTS" CFLAGS =+ "-I${S}/include"
Signature · 1 line
1.7.9.5
PATCH 8/32 gcc-configure-common.inc: use --with-long-double-128 on powerpc to comply with ABI
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
--- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- meta/recipes-devtools/gcc/gcc-configure-common.inc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r25" +PR = "r26" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0
meta/recipes-devtools/gcc/gcc-configure-common.inc +4 -0
@@ -53,6 +53,10 @@ EXTRA_OECONF_append_linux-uclibceabi = " --disable-__cxa_atexit" EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" CPPFLAGS = "" +# powerpc needs this to comply with the ABI +EXTRA_OECONF_append_powerpc = " --with-long-double-128" +EXTRA_OECONF_append_powerpc64 = " --with-long-double-128" + # Used by configure to define additional values for FLAGS_FOR_TARGET - # passed to all the compilers. ARCH_FLAGS_FOR_TARGET = "${TARGET_CC_ARCH}"
Signature · 1 line
1.7.9.5
PATCH 9/32 gcc: gcc-cross-canadian: use correct location for libraries for powerpc64
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
This fixes the issue where gcc invokes the linker with an incorrect -L library location and gives up because it can't find libraries. It was looking in a /lib folder instead of /lib64
--- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- .../recipes-devtools/gcc/gcc-cross-canadian_4.6.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r26" +PR = "r27" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0
meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb +2 -2
@@ -9,8 +9,8 @@ DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" SYSTEMHEADERS = "/usr/include" -SYSTEMLIBS = "/lib/" -SYSTEMLIBS1 = "/usr/lib/" +SYSTEMLIBS = "${target_base_libdir}/" +SYSTEMLIBS1 = "${target_libdir}/" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \
Signature · 1 line
1.7.9.5
PATCH 10/32 libgomp: add libgomp (openmp) library, and build for powerpc targets by default
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
--- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- .../recipes-devtools/gcc/gcc-configure-runtime.inc | 7 +++++++ meta/recipes-devtools/gcc/gcc-package-runtime.inc | 12 ++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r27" +PR = "r28" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0
meta/recipes-devtools/gcc/gcc-configure-runtime.inc +7 -0
@@ -9,6 +9,8 @@ EXTRA_OECONF_PATHS = " \ --with-build-sysroot=${STAGING_DIR_TARGET}" RUNTIMETARGET = "libssp libstdc++-v3" +RUNTIMETARGET_append_powerpc = " libgomp" +RUNTIMETARGET_append_powerpc64 = " libgomp" # ? # libiberty # libmudflap
@@ -36,6 +38,11 @@ do_install () { for d in ${RUNTIMETARGET}; do cd ${B}/$d/ oe_runmake 'DESTDIR=${D}' install + if [ "$d" = "libgomp" ]; then + rm -rf ${D}${datadir}/info/libgomp.info ${D}${datadir}/info/dir + rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude + rmdir --ignore-fail-on-non-empty -p ${D}${datadir}/info + fi done chown -R root:root ${D} }
meta/recipes-devtools/gcc/gcc-package-runtime.inc +12 -0
@@ -13,6 +13,9 @@ PACKAGES = "\ libgfortran-dev \ libmudflap \ libmudflap-dev \ + libgomp \ + libgomp-dev \ + libgomp-staticdev \ " # The base package doesn't exist, so we clear the recommends. RRECOMMENDS_${PN}-dbg = ""
@@ -61,3 +64,12 @@ FILES_libmudflap-dev = "\ ${libdir}/libmudflap*.a \ ${libdir}/libmudflap*.la" +FILES_libgomp-dev = "\ + ${libdir}/libgomp*.so \ + ${libdir}/libgomp*.la \ + ${libdir}/libgomp.spec \ + ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/omp.h \ + " +FILES_libgomp-staticdev = "\ + ${libdir}/libgomp*.a \ + "
Signature · 1 line
1.7.9.5
PATCH 11/32 sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to be defined
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
Set SERIAL_CONSOLES if you want to define multiple serial consoles, also if you need to check for the presence of the serial consoles you can also define SERIAL_CONSOLES_CHECK to determine if these are present when you boot. This will prevent error message that pop up when the serial port is not present.
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
The above lines in machine.conf or elsewhere will have the effect of having two serial consoles and removing any that are not present at boot
--- .../sysvinit/sysvinit-inittab_2.88dsf.bb | 22 ++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +20 -2
@@ -2,7 +2,7 @@ DESCRIPTION = "Inittab for sysvinit" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -PR = "r6" +PR = "r7" SRC_URI = "file://inittab"
@@ -26,7 +26,8 @@ do_install() { for i in $tmp do j=`echo ${i} | sed s/\;/\ /g` - echo "${idx}:2345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab + echo "${idx}:12345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab + idx=`expr $idx + 1` done
@@ -51,6 +52,23 @@ EOF fi } +pkg_postinst_${PN} () { +# run this on the target +if [ "x$D" == "x" ]; then + tmp="${SERIAL_CONSOLES_CHECK}" + for i in $tmp + do + j=`echo ${i} | sed s/^.*\;//g` + if [ -z "`cat /proc/consoles | grep ${j}`" ]; then + sed -i /^.*${j}$/d /etc/inittab + fi + done + kill -HUP 1 +else + exit 1 +fi +} + # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
1.7.9.5
Re: [PATCH 11/32] sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to be defined
Quoted 6 lines · Scott Garman
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +6
-0+pkg_postinst_${PN} () { +# run this on the target +if [ "x$D" == "x" ]; then + tmp="${SERIAL_CONSOLES_CHECK}" + for i in $tmp + do
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb EOF · line 70
Quoted 10 lines
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +10
-0+ j=`echo ${i} | sed s/^.*\;//g` + if [ -z "`cat /proc/consoles | grep ${j}`" ]; then + sed -i /^.*${j}$/d /etc/inittab + fi + done + kill -HUP 1 +else + exit 1 +fi +}
This makes the package uninstallable, even if SERIAL_CONSOLES_CHECK is empty, on a READ_ONLY_ROOTFS.
p.
Re: [PATCH 11/32] sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to be defined
Quoted 12 lines · Phil Blundell
Quoted 11 lines · Scott Garman
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +11
-0+pkg_postinst_${PN} () { +# run this on the target +if [ "x$D" == "x" ]; then + tmp="${SERIAL_CONSOLES_CHECK}" + for i in $tmp + do + j=`echo ${i} | sed s/^.*\;//g` + if [ -z "`cat /proc/consoles | grep ${j}`" ]; then + sed -i /^.*${j}$/d /etc/inittab + fi + done
Quoted 8 lines
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb EOF · line 70
Quoted 5 lines
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +5
-0+ kill -HUP 1 +else + exit 1 +fi +}This makes the package uninstallable, even if
SERIAL_CONSOLES_CHECKis empty, on aREAD_ONLY_ROOTFS.
What do you mean uninstallable? I could see this generating an error message at each boot, but not sure what you mean about uninstallable.
-M
Re: [PATCH 11/32] sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to be defined
Quoted 22 lines · On Mon, 2012-09-10 at 16:56 +0000, McClintock Matthew-B29882 wrote:
Quoted 12 lines · Phil Blundell
Quoted 11 lines · Scott Garman
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +11
-0+pkg_postinst_${PN} () { +# run this on the target +if [ "x$D" == "x" ]; then + tmp="${SERIAL_CONSOLES_CHECK}" + for i in $tmp + do + j=`echo ${i} | sed s/^.*\;//g` + if [ -z "`cat /proc/consoles | grep ${j}`" ]; then + sed -i /^.*${j}$/d /etc/inittab + fi + doneQuoted 8 lines
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb EOF · line 70
Quoted 5 lines
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +5
-0+ kill -HUP 1 +else + exit 1 +fi +}This makes the package uninstallable, even if
SERIAL_CONSOLES_CHECKis empty, on aREAD_ONLY_ROOTFS.
Quoted 2 lines
What do you mean uninstallable? I could see this generating an error message at each boot, but not sure what you mean about uninstallable.
rootfs_ipk will refuse to generate a rootfs containing unconfigured packages if IMAGE_FEATURES says that it should be read-only.
p.
Re: [PATCH 11/32] sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to be defined
In reply to Scott Garmanmeta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb EOF · line 57
Quoted 3 lines · Scott Garman
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +3
-0+pkg_postinst_${PN} () { +# run this on the target +if [ "x$D" == "x" ]; then
By the way, "==" is a bashism; that should just be "=" for portability. Or you can use '-z "$D"' which is also portable.
p.
Re: [PATCH 11/32] sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to be defined
Quoted 7 lines · Phil Blundell
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb EOF · line 57
Quoted 3 lines · Scott Garman
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +3
-0+pkg_postinst_${PN} () { +# run this on the target +if [ "x$D" == "x" ]; thenBy the way, "==" is a bashism; that should just be "=" for portability. Or you can use '-z "$D"' which is also portable.
Ok - will send a v3 shortly.
-M
Quoted 9 lines
p.
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
PATCH 12/32 lsof: define linux C library type when using eglibc
In reply to Scott GarmanFrom: Ting Liu <[email protected]>
lsof tries to compile a temp c source file and execute the binary to determine linux C library type (file Configure, line 2689-2717). It is inpracticable for cross-compilation and may have build issue on some distros since it depends on host settings.
Fix below error when building for 64bit target on 64bit host:
[...]
| dsock.c:481:44: error: 'TCP_LISTEN' undeclared (first use in this function) | dsock.c:482:45: error: 'TCP_CLOSING' undeclared (first use in this function) [...]
| make: *** [dsock.o] Error 1
The actual issue exists in do_configure:
[...]
Testing C library type with cc ... done
Cannot determine C library type; assuming it is not glibc.
Which is in turn caused by missing 'gnu/stubs-32.h" when compiling the temp c source file on host:
[...]
fatal error: gnu/stubs-32.h: No such file or directory compilation terminated.
file gnu/stubs-32.h is provided by 32bit glibc.
--- meta/recipes-extended/lsof/lsof_4.85.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-extended/lsof/lsof_4.85.bb +6 -1
@@ -3,7 +3,7 @@ DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \ Its name stands for LiSt Open Files, and it does just that." SECTION = "devel" LICENSE = "BSD" -PR = "r0" +PR = "r1" SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2"
@@ -29,6 +29,11 @@ LSOF_OS_libc-glibc = "linux" export LSOF_INCLUDE = "${STAGING_INCDIR}" do_configure () { + if [ "x${EGLIBCVERSION}" != "x" ];then + LINUX_CLIB=`echo ${EGLIBCVERSION} |sed -e 's,\.,,g'` + LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}" + export LINUX_CLIB + fi yes | ./Configure ${LSOF_OS} }
Signature · 1 line
1.7.9.5
PATCH 13/32 task-core-sdk.bb: add libgomp and libgomp-dev by RECOMMENDS
In reply to Scott GarmanFrom: Zhenhua Luo <[email protected]>
--- meta/recipes-core/tasks/task-core-sdk.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-core/tasks/task-core-sdk.bb +5 -1
@@ -7,7 +7,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "task-core-console" -PR = "r7" +PR = "r8" ALLOW_EMPTY = "1" #PACKAGEFUNCS =+ 'generate_sdk_pkgs'
@@ -48,6 +48,10 @@ RDEPENDS_task-core-sdk = "\ file \ tcl" +RRECOMMENDS_task-core-sdk = "\ + libgomp \ + libgomp-dev" + #python generate_sdk_pkgs () { # poky_pkgs = read_pkgdata('task-core', d)['PACKAGES'] # pkgs = d.getVar('PACKAGES', True).split()
Signature · 1 line
1.7.9.5
PATCH 14/32 augeas: Add libxml2 dependency
In reply to Scott GarmanFrom: Martin Donnelly <[email protected]>
This patch fixes the following Augeas configure error.
| checking for LIBXML... no | configure: error: Package requirements (libxml-2.0) were not met: | | No package 'libxml-2.0' found | | Consider adjusting the PKG_CONFIG_PATH environment variable if you | installed software in a non-standard prefix. | | Alternatively, you may set the environment variables LIBXML_CFLAGS | and LIBXML_LIBS to avoid the need to call pkg-config. | See the pkg-config man page for more details. | ERROR: oe_runconf failed
--- meta/recipes-extended/augeas/augeas.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/augeas/augeas.inc +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff" SRC_URI = "http://augeas.net/download/${BP}.tar.gz" -DEPENDS = "readline" +DEPENDS = "readline libxml2" inherit autotools
Signature · 1 line
1.7.9.5
PATCH 15/32 curl: enable ssl support
In reply to Scott GarmanFrom: Saul Wold <[email protected]>
This patch enables ssl support for curl to allow git to clone from https / ssl sites. We do not want to enable gnutls for native or nativesdk, as it adds additional dependency and increase build time
[YOCTO #2532]
--- meta/recipes-support/curl/curl_7.24.0.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-support/curl/curl_7.24.0.bb +5 -5
@@ -5,10 +5,10 @@ SECTION = "console/network" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" -DEPENDS = "zlib gnutls" -DEPENDS_virtclass-native = "zlib-native" -DEPENDS_virtclass-nativesdk = "zlib-nativesdk" -PR = "r0" +DEPENDS = "zlib gnutls openssl" +DEPENDS_virtclass-native = "zlib-native openssl-native" +DEPENDS_virtclass-nativesdk = "zlib-nativesdk openssl-nativesdk" +PR = "r1" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://noldlibpath.patch \
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01 inherit autotools pkgconfig binconfig EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ - --without-ssl \ + --with-ssl \ --without-libssh2 \ --with-random=/dev/urandom \ --without-libidn \
Signature · 1 line
1.7.9.5
PATCH 16/32 curl: Use gnutls for target and openssl for native
In reply to Scott GarmanFrom: Saul Wold <[email protected]>
Since gnutls is available on the target use it, but we do not build gnutls for the native side as it adds too many dependecies, so use openssl.
--- meta/recipes-support/curl/curl_7.24.0.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
meta/recipes-support/curl/curl_7.24.0.bb +6 -7
@@ -5,10 +5,10 @@ SECTION = "console/network" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" -DEPENDS = "zlib gnutls openssl" +DEPENDS = "zlib gnutls" DEPENDS_virtclass-native = "zlib-native openssl-native" -DEPENDS_virtclass-nativesdk = "zlib-nativesdk openssl-nativesdk" -PR = "r1" +DEPENDS_virtclass-nativesdk = "zlib-nativesdk" +PR = "r2" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://noldlibpath.patch \
@@ -20,7 +20,6 @@ SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01 inherit autotools pkgconfig binconfig EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ - --with-ssl \ --without-libssh2 \ --with-random=/dev/urandom \ --without-libidn \
@@ -28,9 +27,9 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ ${CURLGNUTLS} \ " -CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../" -CURLGNUTLS_virtclass-native = "--without-gnutls" -CURLGNUTLS_virtclass-nativesdk = "--without-gnutls" +CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" +CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl" +CURLGNUTLS_virtclass-nativesdk = "--without-gnutls --without-ssl" do_configure_prepend() { sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
Signature · 1 line
1.7.9.5
PATCH 17/32 xserver-xorg: Fix build on powerpc
In reply to Scott GarmanFrom: Khem Raj <[email protected]>
--- .../xorg-xserver/xserver-xorg-1.11.2.inc | 9 +++--- .../xserver-xorg-1.11.2/gcc-47-warning.patch | 33 ++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc +5 -4
@@ -1,10 +1,11 @@ -SRC_URI += "file://crosscompile.patch" - # Misc build failure for master HEAD -SRC_URI += "file://fix_open_max_preprocessor_error.patch" +SRC_URI += "file://crosscompile.patch \ + file://fix_open_max_preprocessor_error.patch \ + file://gcc-47-warning.patch \ + " SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" -PR = "r1" +PR = "r2"
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch new file +33 -0
@@ -0,0 +1,33 @@ +This patch fixes errors on powerpc like below + +| lnx_video.c: In function 'unmapVidMem': +| lnx_video.c:472:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + +Its in 1.12 branch + +http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.12-branch&id=eb3377ffb8a7baa26c9831e56ed782d48b28fa71 + +Upstream-Status: Backport + +Signed-off-by: Khem Raj <[email protected]> + +Index: xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c +=================================================================== +--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:32:34.186489019 -0700 ++++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01 06:49:14.926537452 -0700 +@@ -469,11 +469,11 @@ + static void + unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) + { +- memType alignOff = (memType)Base +- - ((memType)Base & ~(getpagesize() - 1)); ++ uintptr_t alignOff = (uintptr_t)Base ++ - ((uintptr_t)Base & ~(getpagesize() - 1)); + +- DebugF("alignment offset: %lx\n",alignOff); +- munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff)); ++ DebugF("alignment offset: %lx\n",(unsigned long)alignOff); ++ munmap((void*)((uintptr_t)Base - alignOff), (Size + alignOff)); + } + +
Signature · 1 line
1.7.9.5
PATCH 18/32 kernel.bbclass: Copy bounds.h only if it exists, needed for 2.6.x.
In reply to Scott GarmanFrom: Leon Woestenberg <[email protected]>
Linux 2.6.x kernels did not (all) have the bounds.h file, so copy only iff exists.
(See OE-Core 02ac0d1b65389e1779d5f95047f761d7a82ef7a4)
--- meta/classes/kernel.bbclass | 5 +++++ 1 file changed, 5 insertions(+)
meta/classes/kernel.bbclass +5 -0
@@ -183,6 +183,11 @@ kernel_do_install() { cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o fi + # Necessary for building modules like compat-wireless. + if [ -f include/generated/bounds.h ]; then + cp include/generated/bounds.h $kerneldir/include/generated/bounds.h + fi + # Remove the following binaries which cause strip errors # during do_package for cross-compiled platforms bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
Signature · 1 line
1.7.9.5
PATCH 19/32 gcc-package-runtime.inc: Fix QA warning
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
Quoted 3 lines
ERROR: QA Issue: gcc-runtime: Files/directories were installed but not shipped
/usr/lib/libgomp.so.1.0.0
/usr/lib/libgomp.so.1
--- meta/recipes-devtools/gcc/gcc-package-runtime.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-package-runtime.inc +2 -1
@@ -64,8 +64,9 @@ FILES_libmudflap-dev = "\ ${libdir}/libmudflap*.a \ ${libdir}/libmudflap*.la" +FILES_libgomp = "${libdir}/libgomp*${SOLIBS}" FILES_libgomp-dev = "\ - ${libdir}/libgomp*.so \ + ${libdir}/libgomp*${SOLIBSDEV} \ ${libdir}/libgomp*.la \ ${libdir}/libgomp.spec \ ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/omp.h \
Signature · 1 line
1.7.9.5
PATCH 20/32 task-core-tools-testapps.bb: kexec-tools does not work on e5500-64b parts
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
This prevents kexec from building for this part since it does not work
--- .../recipes-core/tasks/task-core-tools-testapps.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-core/tasks/task-core-tools-testapps.bb +1 -0
@@ -22,6 +22,7 @@ KEXECTOOLS ?= "kexec" KEXECTOOLS_mips ?= "" KEXECTOOLS_mipsel ?= "" KEXECTOOLS_powerpc ?= "" +KEXECTOOLS_e5500-64b ?= "" RDEPENDS_${PN} = "\ blktool \
Signature · 1 line
1.7.9.5
PATCH 21/32 image_types.bbclass: redefine EXTRA_IMAGECMD_jffs2 to leverage siteinfo
In reply to Scott GarmanFrom: Ting Liu <[email protected]>
--- meta/classes/image_types.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/classes/image_types.bbclass +6 -1
@@ -188,7 +188,12 @@ IMAGE_CMD_ubi () { IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}" EXTRA_IMAGECMD = "" -EXTRA_IMAGECMD_jffs2 ?= "--pad --little-endian --eraseblock=0x40000" + +inherit siteinfo +JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--little-endian', '--big-endian', d)}" +JFFS2_ERASEBLOCK ?= "0x40000" +EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" + # Change these if you want default genext2fs behavior (i.e. create minimal inode number) EXTRA_IMAGECMD_ext2 ?= "-i 8192" EXTRA_IMAGECMD_ext3 ?= "-i 8192"
Signature · 1 line
1.7.9.5
PATCH 22/32 libtool: fixed parallel build related race
In reply to Scott GarmanFrom: Enrico Scholz <[email protected]>
While building libtool, the libtool script itself will be regenerated because OE modifies a dependency[1]. With -jX, this operation (--> removal, creation of non-x file, 'chmod a+x') can happen at a time when the script is going to be executed. This can cause errors like:
| arm-linux-gnueabi-libtool: compile: ccache arm-linux-gnueabi-gcc ... | ... | /bin/sh ./config.status libtool | ... | arm-linux-gnueabi-libtool: compile: ccache arm-linux-gnueabi-gcc ... | /bin/sh: ./arm-linux-gnueabi-libtool: Permission denied | make[2]: *** [libltdl/libltdl_libltdl_la-lt__alloc.lo] Error 126
I am not sure whether the custom do_compile_prepend() is still needed. For now only the issue above will be fixed by executing ./config.status yet again.
[1] see 648290d5bf4d6ff50d3643bb7ad902dfc23aa702
--- meta/recipes-devtools/libtool/libtool-2.4.2.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-devtools/libtool/libtool-2.4.2.inc +2 -1
@@ -8,7 +8,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://trailingslash.patch \
@@ -27,6 +27,7 @@ do_compile_prepend () { # Sometimes this file doesn't get rebuilt, force the issue rm -f ${S}/libltdl/config/ltmain.sh make libltdl/config/ltmain.sh + ./config.status } inherit autotools
Signature · 1 line
1.7.9.5
PATCH 23/32 utils.bbclass: add helper function to add all multilib variants of a specific package
In reply to Scott GarmanFrom: Richard Purdie <[email protected]>
This is useful for the scenario where we want to add 'gcc' to the root file system for all multilib variants
--- meta/classes/utils.bbclass | 9 +++++++++ 1 file changed, 9 insertions(+)
meta/classes/utils.bbclass +9 -0
@@ -351,6 +351,15 @@ def extend_variants(d, var, extend, delim=':'): variants.append(eext[1]) return " ".join(variants) +def multilib_pkg_extend(d, pkg): + variants = (d.getVar("MULTILIB_VARIANTS", True) or "").split() + if not variants: + return pkg + pkgs = pkg + for v in variants: + pkgs = pkgs + " " + v + "-" + pkg + return pkgs + def all_multilib_tune_values(d, var, unique = True, need_split = True, delim = ' '): """Return a string of all ${var} in all multilib tune configuration""" values = []
Signature · 1 line
1.7.9.5
PATCH 24/32 tcl: fix target recipe build issue on older distros
In reply to Scott GarmanFrom: Nitin A Kamble <[email protected]>
the builddir is put in front of the LD_LIBRARY_PATH, causing dynamically linking of target library with native tclsh.
Fix this behavior to cross build tcl correctly.
This issue got exposed when eglibc-2.15 was configured for the target.
--- .../tcl/fix_issue_with_old_distro_glibc.patch | 109 ++++++++++++++++++++ meta/recipes-devtools/tcltk/tcl_8.5.11.bb | 5 +- 2 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch new file +109 -0
@@ -0,0 +1,109 @@ +Upstream-Status: inappropriate [embedded specific] + +Fixes tcl target recipe build on old distros which have glibc older than 2.14 + +| + echo 'NOTE: make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install' +| NOTE: make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install +| + make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install +| Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/lib +| Installing message catalogs +| Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/share/man +| tclsh: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/tcl8.5.11/unix/libtcl8.5.so) +| Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/bin +| make: *** [install-msgs] Error 1 + +Signed-Off-By: Nitin A Kamble <[email protected]> +2012/04/26 + +Index: unix/Makefile.in +=================================================================== +--- unix.orig/Makefile.in ++++ unix/Makefile.in +@@ -592,12 +592,12 @@ tcltest-real: + # % make test TESTFLAGS="-verbose bps -file fileName.test" + + test: tcltest@EXEEXT@ +- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ./tcltest@EXEEXT@ $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) + + gdb-test: tcltest@EXEEXT@ +- @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run ++ @echo "set env @LD_LIBRARY_PATH_VAR@=\"$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run + @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run + @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run + $(GDB) ./tcltest@EXEEXT@ --command=gdb.run +@@ -605,27 +605,27 @@ gdb-test: tcltest@EXEEXT@ + + # Useful target to launch a built tcltest with the proper path,... + runtest: tcltest@EXEEXT@ +- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ./tcltest@EXEEXT@ + + # Useful target for running the test suite with an unwritable current + # directory... + ro-test: tcltest@EXEEXT@ +- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | ./tcltest@EXEEXT@ + + # This target can be used to run tclsh from the build directory + # via `make shell SCRIPT=/tmp/foo.tcl` + shell: ${TCL_EXE} +- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ${TCL_EXE} $(SCRIPT) + + # This target can be used to run tclsh inside either gdb or insight + gdb: ${TCL_EXE} +- @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run ++ @echo "set env @LD_LIBRARY_PATH_VAR@=\"$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run + @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run + $(GDB) ${TCL_EXE} --command=gdb.run + rm gdb.run +@@ -633,12 +633,12 @@ gdb: ${TCL_EXE} + VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v + + valgrind: ${TCL_EXE} tcltest@EXEEXT@ +- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + valgrind $(VALGRINDARGS) ./tcltest@EXEEXT@ $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS) + + valgrindshell: ${TCL_EXE} +- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + valgrind $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT) + +@@ -802,14 +802,14 @@ install-libraries: libraries $(INSTALL_T + + install-tzdata: ${TCL_EXE} + @echo "Installing time zone data" +- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ + $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata + + install-msgs: ${TCL_EXE} + @echo "Installing message catalogs" +- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ + $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs +@@ -1733,7 +1733,7 @@ html-tk: ${TCL_EXE} + @EXTRA_BUILD_HTML@ + + BUILD_HTML = \ +- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ ++ @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ${TCL_EXE} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ + --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
meta/recipes-devtools/tcltk/tcl_8.5.11.bb +3 -2
@@ -11,13 +11,14 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ " -PR = "r5" +PR = "r6" BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ file://tcl-add-soname.patch" SRC_URI = "${BASE_SRC_URI} \ - file://fix_non_native_build_issue.patch " + file://fix_non_native_build_issue.patch \ + file://fix_issue_with_old_distro_glibc.patch " SRC_URI[md5sum] = "b01a9691c83990b3db0ce62d1012ca67" SRC_URI[sha256sum] = "8addc385fa6b5be4605e6d68fbdc4c0e674c5af1dc1c95ec5420390c4b08042a"
Signature · 1 line
1.7.9.5
PATCH 25/32 u-boot.inc: update linker arguments to pass --sysroot arg
In reply to Scott GarmanFrom: Matthew McClintock <[email protected]>
If we are building from sstate-cache it's possible to be building from another folder on another machine, therefore the linker requires that a proper --sysroot is passed too it so it can find things like libgcc.a and avoid errors such as:
| arm-poky-linux-gnueabi-gcc -g -O2 -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80008000 -I/local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/work/beagleboard-poky-linux-gnueabi/u-boot-v2011.06+git5+b1af6f532e0d348b153d5c148369229d24af361a-r0/git/include -fno-builtin -ffreestanding -nostdinc -isystem /local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/sysroots/x86_64-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/../../lib/armv7a-vfp-neon-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.6.3/include -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork -march=armv5 -Wall -Wstrict-prototypes -fno-stack-protector -fno-toplevel-reorder -o hello_world.o hello_world.c -c | arm-poky-linux-gnueabi-gcc -g -O2 -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80008000 -I/local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/work/beagleboard-poky-linux-gnueabi/u-boot-v2011.06+git5+b1af6f532e0d348b153d5c148369229d24af361a-r0/git/include -fno-builtin -ffreestanding -nostdinc -isystem /local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/sysroots/x86_64-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/../../lib/armv7a-vfp-neon-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.6.3/include -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork -march=armv5 -Wall -Wstrict-prototypes -fno-stack-protector -fno-toplevel-reorder -o stubs.o stubs.c -c | arm-poky-linux-gnueabi-ld -r -o libstubs.o stubs.o | arm-poky-linux-gnueabi-ld -g -Ttext 0x80300000 \ | -o hello_world -e hello_world hello_world.o libstubs.o \ | -L. -lgcc | arm-poky-linux-gnueabi-ld: cannot find -lgcc | make[1]: *** [hello_world] Error 1
--- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- meta/recipes-bsp/u-boot/u-boot_2011.03.bb | 2 +- meta/recipes-bsp/u-boot/u-boot_2011.06.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-bsp/u-boot/u-boot.inc +1 -1
@@ -8,7 +8,7 @@ inherit deploy PARALLEL_MAKE="" # GCC 4.5.1 builds unusable binaries using -Os, remove it from OPTFLAGS -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} OPTFLAGS='-O2'" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} OPTFLAGS='-O2' CC='${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}'" python () { if not d.getVar("UBOOT_MACHINE", True):
meta/recipes-bsp/u-boot/u-boot_2011.03.bb +1 -1
@@ -17,7 +17,7 @@ FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca" PV = "v2011.03+git${SRCPV}" -PR = "r6" +PR = "r7" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
meta/recipes-bsp/u-boot/u-boot_2011.06.bb +1 -1
@@ -17,7 +17,7 @@ FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a" PV = "v2011.06+git${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
Signature · 1 line
1.7.9.5
PATCH 26/32 shadow-native: use 'users' group by default
In reply to Scott GarmanFrom: Otavio Salvador <[email protected]>
The rootfs has 'users' group at number 100 and without this fix it would assign to a non-existent group and if a group with gid as 1000 is created later it would own all files for users created.
Reworked commit to fix merge conflicts with denzil branch.
--- .../shadow/shadow-native_4.1.4.3.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb +4 -1
@@ -7,7 +7,7 @@ LICENSE = "BSD | Artistic-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe" -PR = "r4" +PR = "r5" SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ file://shadow.automake-1.11.patch \
@@ -44,6 +44,9 @@ do_install_append() { sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd + # Use users group by default + sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd + install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} for i in passwd chfn newgrp chsh ; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
Signature · 1 line
1.7.9.5
PATCH 27/32 shadow: use 'users' group by default
In reply to Scott GarmanFrom: Otavio Salvador <[email protected]>
The rootfs has 'users' group at number 100 and without this fix it would assign to a non-existent group and if a group with gid as 1000 is created later it would own all files for users created.
Reworked commit to fix merge conflicts with denzil branch.
--- meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-extended/shadow/shadow_4.1.4.3.bb +4 -1
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" -PR = "r8" +PR = "r9" SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ file://login_defs_pam.sed \
@@ -83,6 +83,9 @@ do_install_append() { sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd + # Use users group by default + sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd + install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} for i in passwd chfn newgrp chsh groups ; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
Signature · 1 line
1.7.9.5
PATCH 28/32 foomatic: fix perl path for target
In reply to Scott GarmanFrom: Saul Wold <[email protected]>
This problem appears on F17 when configure finds /bin/perl, since the beh script is a target side script, we need to set PERL in the do_configure_prepend in order for the correct perl to be used
Reworked commit to fix merge conflicts with denzil branch.
--- .../foomatic/foomatic-filters_4.0.7.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb +2 -1
@@ -10,7 +10,7 @@ format using a printer-specific, but spooler-independent PPD file. \ " DEPENDS += "cups perl libxml2" -PR = "r3" +PR = "r4" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://${WORKDIR}/foomatic-filters-${PV}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
@@ -25,6 +25,7 @@ inherit autotools EXTRA_OECONF += "--disable-file-converter-check --with-file-converter=texttops" do_configure_prepend() { + export PERL="${bindir}/env perl" export LIB_CUPS=${exec_prefix}/lib/cups # /usr/lib NOT libdir export CUPS_BACKENDS=${exec_prefix}/lib/cups/backend # /usr/lib NOT libdir export CUPS_FILTERS=${exec_prefix}/lib/cups/filter # /usr/lib NOT libdir
Signature · 1 line
1.7.9.5
PATCH 29/32 classes/rootfs_*: fix splitting package dependency strings
In reply to Scott GarmanFrom: Paul Eggleton <[email protected]>
If a + character appears in a version specification within the list of package dependencies, the version will not be removed from the list in list_package_depends/recommends leading to garbage appearing in the dependency graphs generated by buildhistory. To avoid any future problems due to unusual characters appearing in versions, change the regex to match almost any character.
Fixes [YOCTO #2451].
--- meta/classes/rootfs_deb.bbclass | 4 ++-- meta/classes/rootfs_ipk.bbclass | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
meta/classes/rootfs_deb.bbclass +2 -2
@@ -101,11 +101,11 @@ get_package_filename() { } list_package_depends() { - ${DPKG_QUERY_COMMAND} -s $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g' + ${DPKG_QUERY_COMMAND} -s $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g' } list_package_recommends() { - ${DPKG_QUERY_COMMAND} -s $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g' + ${DPKG_QUERY_COMMAND} -s $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g' } rootfs_check_package_exists() {
meta/classes/rootfs_ipk.bbclass +2 -2
@@ -143,11 +143,11 @@ get_package_filename() { } list_package_depends() { - opkg-cl ${IPKG_ARGS} info $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g' + opkg-cl ${IPKG_ARGS} info $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g' } list_package_recommends() { - opkg-cl ${IPKG_ARGS} info $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g' + opkg-cl ${IPKG_ARGS} info $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g' } rootfs_check_package_exists() {
Signature · 1 line
1.7.9.5
PATCH 30/32 buildhistory_analysis: fix error when version specifier missing
In reply to Scott GarmanFrom: Paul Eggleton <[email protected]>
Passing None to split_versions() will raise an exception, so check that the version is specified before passing it in.
--- meta/lib/oe/buildhistory_analysis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/buildhistory_analysis.py +1 -1
@@ -272,7 +272,7 @@ def compare_pkg_lists(astr, bstr): if k in depverb: dva = depvera[k] dvb = depverb[k] - if dva != dvb: + if dva and dvb and dva != dvb: if bb.utils.vercmp(split_version(dva), split_version(dvb)) < 0: remove.append(k)
Signature · 1 line
1.7.9.5
PATCH 31/32 scripts/buildhistory-diff: add GitPython version check
In reply to Scott GarmanFrom: Paul Eggleton <[email protected]>
Display an error if the user does not have at least version 0.3.1 of GitPython installed.
--- scripts/buildhistory-diff | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
scripts/buildhistory-diff +6 -2
@@ -7,16 +7,20 @@ import sys import os +from distutils.version import LooseVersion # Ensure PythonGit is installed (buildhistory_analysis needs it) try: import git except ImportError: - print("Please install PythonGit 0.3.1 or later in order to use this script") + print("Please install GitPython (python-git) 0.3.1 or later in order to use this script") sys.exit(1) - def main(): + if LooseVersion(git.__version__) < '0.3.1': + print("Version of GitPython is too old, please install GitPython (python-git) 0.3.1 or later in order to use this script") + sys.exit(1) + if (len(sys.argv) < 3): print("Report significant differences in the buildhistory repository") print("Syntax: %s <buildhistory-path> <since-revision> [to-revision]" % os.path.basename(sys.argv[0]))
Signature · 1 line
1.7.9.5
PATCH 32/32 classes/license: fix manifest to work with deb
In reply to Scott GarmanFrom: Paul Eggleton <[email protected]>
Prepend the license manifest creation call to ROOTFS_POSTPROCESS_COMMAND instead of appending to ROOTFS_POSTINSTALL_COMMAND. The latter is not implemented for the deb backend (and probably ought to just be removed completely), and by using _prepend we can still ensure it occurs before package info is removed (and before buildhistory in case it is needed there in future).
--- meta/classes/license.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/license.bbclass +1 -1
@@ -382,7 +382,7 @@ do_populate_lic[sstate-name] = "populate-lic" do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}" do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/" -ROOTFS_POSTINSTALL_COMMAND += "license_create_manifest; " +ROOTFS_POSTPROCESS_COMMAND_prepend = "license_create_manifest; " python do_populate_lic_setscene () { sstate_setscene(d)
Signature · 1 line
1.7.9.5
Richard Purdie
AppliedQuoted 11 lines · Scott Garman
Hello,
This is my first pull request for denzil since the 1.2.1 release was made.
It has been run through the autobuilder, which is having some issues with running sanity tests and buildhistory, so if the build succeeded for everything except for those steps, I note it as "Green with known AB issues" below.
Note that these tests were run with a poky-based branch.
[...]
Quoted 9 lines
The following changes since commit
741146fa90f28f7ce8d82ee7f7e254872d519724:gconf.bbclass: don't register schemas in the install stage (2012-06-29 15:03:01 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribsgarman/denzil-next-pull1
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgarman/denzil-next-pull1
Merged to denzil. Thanks for putting this together.
Cheers,
Richard