default-provider: also define a default provider for gconf-native
PATCH 1/10 default-provider: also define a default provider for gconf-native
--- meta/conf/distro/include/default-providers.inc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
meta/conf/distro/include/default-providers.inc +1 -0
@@ -22,6 +22,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" +PREFERRED_PROVIDER_gconf-native ?= "gconf-dbus-native" PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf" PREFERRED_PROVIDER_libgcc ?= "libgcc" PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
Signature · 1 line
1.7.2.5
PATCH 2/10 bitbake.conf: change ccache path to use MULTIMACH_HOST_SYS
Currently if I build packages for several targets (e.g. for armv5te tosa and for armv7a beagleboard) oe will use single ccache dir for both of those targets: build/ccache/arm-oe-linux-gnueabi. However those targets use different opcodes, different features and binaries created for one of those targets wont't run on the lower one. So use MULTIMACH_HOST_SYS for ccache dir, so that it uses something like build/ccache/armv5te-oe-linux-gnueabi dir.
--- meta/conf/bitbake.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/bitbake.conf +1 -1
@@ -407,7 +407,7 @@ export PATH CCACHE = "${@bb.which(bb.data.getVar('PATH', d, 1), 'ccache') and 'ccache '}" TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" -export CCACHE_DIR = "${TMPDIR}/ccache/${HOST_SYS}/${PN}" +export CCACHE_DIR = "${TMPDIR}/ccache/${MULTIMACH_HOST_SYS}/${PN}" export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
Signature · 1 line
1.7.2.5
PATCH 3/10 bash-completion: new recipe
In reply to Dmitry Eremin-SolenikovAdd a bash-completion recipe. Largely based on the one from oe-dev repo. Changes:
1) Version bump to most recent bash-completion upstream tarball
2) Dropped custom profile.d script in favour of upstream one.
--- .../bash-completion/bash-completion_20060301.bb | 28 ++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-extended/bash-completion/bash-completion_20060301.bb
meta/recipes-extended/bash-completion/bash-completion_20060301.bb new file +28 -0
@@ -0,0 +1,28 @@ +DESCRIPTION = "Programmable Completion for Bash" +SECTION = "console/utils" +RDEPENDS_${PN} = "bash" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +PR = "r0" + +SRC_URI = "http://www.caliban.org/files/bash/bash-completion-${PV}.tar.gz" +S = "${WORKDIR}/bash_completion" + +do_configure() { + : +} + +do_compile() { + : +} + +do_install() { + install -d ${D}${sysconfdir}/profile.d + install -m 0755 bash_completion.sh ${D}${sysconfdir}/profile.d + install -m 0755 bash_completion ${D}${sysconfdir} + install -d ${D}${sysconfdir}/bash_completion.d/ + install -m 0755 contrib/* ${D}${sysconfdir}/bash_completion.d/ +} + +SRC_URI[md5sum] = "9bca1cf97e8f8c73e3ef560cc9dead21" +SRC_URI[sha256sum] = "29b78834b975b29810f0bf1f15e5d3a6c003a137cfac7fea671bfaf8f58f5c0d"
Signature · 1 line
1.7.2.5
Re: [PATCH 03/10] bash-completion: new recipe
Quoted 35 lines · Dmitry Eremin-Solenikov
Add a bash-completion recipe. Largely based on the one from oe-dev repo. Changes:
1) Version bump to most recent bash-completion upstream tarball
2) Dropped custom profile.d script in favour of upstream one.Signed-off-by Dmitry Eremin-Solenikov <[email protected]>--- .../bash-completion/bash-completion_20060301.bb | 28 ++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-extended/bash-completion/bash-completion_20060301.bbmeta/recipes-extended/bash-completion/bash-completion_20060301.bb new file +18
-0@@ -0,0 +1,28 @@ +DESCRIPTION = "Programmable Completion for Bash" +SECTION = "console/utils" +RDEPENDS_${PN} = "bash" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +PR = "r0" + +SRC_URI = "http://www.caliban.org/files/bash/bash-completion-${PV}.tar.gz" +S = "${WORKDIR}/bash_completion" + +do_configure() { + : +} + +do_compile() { + : +} +
meta/recipes-extended/bash-completion/bash-completion_20060301.bb line 28
Quoted 10 lines
meta/recipes-extended/bash-completion/bash-completion_20060301.bb new file +10
-0+do_install() { + install -d ${D}${sysconfdir}/profile.d + install -m 0755 bash_completion.sh ${D}${sysconfdir}/profile.d + install -m 0755 bash_completion ${D}${sysconfdir} + install -d ${D}${sysconfdir}/bash_completion.d/ + install -m 0755 contrib/* ${D}${sysconfdir}/bash_completion.d/ +} + +SRC_URI[md5sum] = "9bca1cf97e8f8c73e3ef560cc9dead21" +SRC_URI[sha256sum] = "29b78834b975b29810f0bf1f15e5d3a6c003a137cfac7fea671bfaf8f58f5c0d"
We might as well put an "inherit allarch" into this recipe...
Cheers,
Richard
PATCH 4/10 dbus-glib: include bash-completion stuff
In reply to Dmitry Eremin-Solenikov--- meta/recipes-core/dbus/dbus-glib.inc | 4 +++- meta/recipes-core/dbus/dbus-glib_0.92.bb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-core/dbus/dbus-glib.inc +3 -1
@@ -19,7 +19,9 @@ EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-in --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" EXTRA_OECONF_virtclass-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml" -FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN} = "${libdir}/lib*.so.* \ + ${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \ + ${libexecdir}/dbus-bash-completion-helper" FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
meta/recipes-core/dbus/dbus-glib_0.92.bb +1 -1
@@ -1,6 +1,6 @@ require dbus-glib.inc -PR = "r0" +PR = "r1" SRC_URI[md5sum] = "b595b36890c4f9f8f5d5dec131c495f8" SRC_URI[sha256sum] = "5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e"
Signature · 1 line
1.7.2.5
Re: [PATCH 04/10] dbus-glib: include bash-completion stuff
On Fri, Sep 23, 2011 at 16:46, Dmitry Eremin-Solenikov <[email protected]> wrote:
...
Quoted 3 lines
+FILES_${PN} = "${libdir}/lib*.so.* \
+${sysconfdir}/bash_completion.d/dbus-bash-completion.sh\
+ ${libexecdir}/dbus-bash-completion-helper"
...
I'd prefer to have this in another package.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Re: [PATCH 04/10] dbus-glib: include bash-completion stuff
Quoted 9 lines · Otavio Salvador
On Fri, Sep 23, 2011 at 16:46, Dmitry Eremin-Solenikov <[email protected]> wrote:
...meta/recipes-core/dbus/dbus-glib.inc EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-in · line 24
Quoted 3 lines
meta/recipes-core/dbus/dbus-glib.inc +3
-0+FILES_${PN} = "${libdir}/lib*.so.* \ + ${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \ + ${libexecdir}/dbus-bash-completion-helper"...
I'd prefer to have this in another package.
Me too, I think this should be packaged separately (with a RRECOMMENDS on bash-completion for good measure).
Cheers,
Richard
Re: [PATCH 04/10] dbus-glib: include bash-completion stuff
Quoted 7 lines · Richard Purdie
Quoted 6 lines · Otavio Salvador
On Fri, Sep 23, 2011 at 16:46, Dmitry Eremin-Solenikov <[email protected]> wrote:
...Quoted 3 lines
+FILES_${PN} = "${libdir}/lib*.so.* \
+${sysconfdir}/bash_completion.d/dbus-bash-completion.sh\
+ ${libexecdir}/dbus-bash-completion-helper"
Quoted 6 lines
Quoted 3 lines
...
I'd prefer to have this in another package.
Me too, I think this should be packaged separately (with a RRECOMMENDS on bash-completion for good measure).
I don't think RRECOMMENDS are good in this case; people were using it without this for long time and noone has noticed yet so it seems not that required.
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Re: [PATCH 04/10] dbus-glib: include bash-completion stuff
Quoted 11 lines · Otavio Salvador
Quoted 9 lines · Richard Purdie
Quoted 8 lines · Otavio Salvador
On Fri, Sep 23, 2011 at 16:46, Dmitry Eremin-Solenikov <[email protected]> wrote:
...Quoted 3 lines
meta/recipes-core/dbus/dbus-glib.inc +3
-0+FILES_${PN} = "${libdir}/lib*.so.* \ + ${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \ + ${libexecdir}/dbus-bash-completion-helper"...
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
I'd prefer to have this in another package.
Me too, I think this should be packaged separately (with a RRECOMMENDS on bash-completion for good measure).
I don't think RRECOMMENDS are good in this case; people were using it without this for long time and noone has noticed yet so it seems not that required.
I mean having dbus-glib-bash-completion RRECOMMENDS bash-completion.
Cheers,
Richard
Re: [PATCH 04/10] dbus-glib: include bash-completion stuff
In reply to Otavio SalvadorQuoted 11 lines · Otavio Salvador
Quoted 8 lines · Richard Purdie
Quoted 7 lines · Otavio Salvador
On Fri, Sep 23, 2011 at 16:46, Dmitry Eremin-Solenikov <[email protected]> wrote:
...Quoted 3 lines
+FILES_${PN} = "${libdir}/lib*.so.* \
+${sysconfdir}/bash_completion.d/dbus-bash-completion.sh\
+ ${libexecdir}/dbus-bash-completion-helper"...
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
I'd prefer to have this in another package.
Me too, I think this should be packaged separately (with a RRECOMMENDS on bash-completion for good measure).
I don't think RRECOMMENDS are good in this case; people were using it without this for long time and noone has noticed yet so it seems not that required.
I think Richard meant that the new dbus-glib-bash-completion(?) package should have a RRECOMMENDS on bash-completion (as it will be pretty useless on a system without bash-completion).
Dbus-glib should definitely not start to RRECOMMEND bash-completion, as noone has requested that for a long time.
Cheers,
Anders
Signature · 2 lines
Anders Darander ChargeStorm AB / eStorm AB
PATCH 5/10 eglibc: fix packaging of some of nativesdk packages, V2
In reply to Dmitry Eremin-Solenikoveglibc.inc contains packaging rules that depend on PKGSUFFIX expansion. However that variable wasn't expanded properly in some case. E.g.
PACKAGES = " ... nscd${PKGSUFFIX} ..."
FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"
would be expanded to
PACKAGES = " ... nscd-nativesdk ..."FILES_nscd = "${sbindir}/nscd*"
Thus leading to empty -nativesdk packages and missing files. To overcome that use python code blob to properly define PKGSUFFIX variable.
As a change from V1, fix the glibc-thread-db related problem by using ${PN} instead of eglibc-XXX-nativesdk for extra-nss and thread-db packages.
--- meta/recipes-core/eglibc/eglibc-locale.inc | 13 +++++++++---- meta/recipes-core/eglibc/eglibc-package.inc | 13 +++++++++---- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- 4 files changed, 20 insertions(+), 10 deletions(-)
meta/recipes-core/eglibc/eglibc-locale.inc +9 -4
@@ -26,10 +26,15 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" # set "0" for qemu emulation of native localedef for locale generation LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" -PR = "r18" - -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" +PR = "r19" + +python __anonymous () { + import bb + if bb.data.inherits_class("nativesdk", d): + bb.data.setVar("PKGSUFFIX", "-nativesdk", d) + else: + bb.data.setVar("PKGSUFFIX", "", d) +} PROVIDES = "virtual/libc-locale${PKGSUFFIX}"
meta/recipes-core/eglibc/eglibc-package.inc +9 -4
@@ -17,8 +17,13 @@ python __anonymous () { # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" +python __anonymous () { + import bb + if bb.data.inherits_class("nativesdk", d): + bb.data.setVar("PKGSUFFIX", "-nativesdk", d) + else: + bb.data.setVar("PKGSUFFIX", "", d) +} PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}"
@@ -28,8 +33,8 @@ RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" RPROVIDES_${PN}-doc = "glibc${PKGSUFFIX}-doc" -RPROVIDES_eglibc-extra-nss${PKGSUFFIX} = "glibc-extra-nss${PKGSUFFIX}" -RPROVIDES_eglibc-thread-db${PKGSUFFIX} = "glibc-thread-db${PKGSUFFIX}" +RPROVIDES_${PN}-extra-nss = "glibc${PKGSUFFIX}-extra-nss" +RPROVIDES_${PN}-thread-db = "glibc${PKGSUFFIX}-thread-db" RPROVIDES_${PN}-pcprofile = "glibc${PKGSUFFIX}-pcprofile" RPROVIDES_${PN}-dbg = "glibc-dbg${PKGSUFFIX}" libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so"
meta/recipes-core/eglibc/eglibc_2.12.bb +1 -1
@@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -PR = "r27" +PR = "r28" SRCREV = "14158"
meta/recipes-core/eglibc/eglibc_2.13.bb +1 -1
@@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "14157" DEPENDS += "gperf-native" -PR = "r17" +PR = "r18" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13"
Signature · 1 line
1.7.2.5
Re: [PATCH 05/10] eglibc: fix packaging of some of nativesdk packages, V2
Quoted 11 lines · Dmitry Eremin-Solenikov
eglibc.inc contains packaging rules that depend on PKGSUFFIX expansion. However that variable wasn't expanded properly in some case. E.g.
PACKAGES = " ... nscd${PKGSUFFIX} ..."
FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"would be expanded to
PACKAGES = " ... nscd-nativesdk ..."
FILES_nscd= "${sbindir}/nscd*"
Quoted 8 lines
Thus leading to empty -nativesdk packages and missing files. To overcome that use python code blob to properly define PKGSUFFIX variable.
As a change from V1, fix the glibc-thread-db related problem by using ${PN} instead of eglibc-XXX-nativesdk for extra-nss and thread-db packages.
Signed-off-by Dmitry Eremin-Solenikov <[email protected]>
I've merged the pieces of this patch series that didn't get feedback. I'm still not 100% convinced this patch is right. I'd like to understand more about the errors you're seeing that area leading you to submit it...
Cheers,
Richard
PATCH 6/10 icecc-create-env-native: provide the script right in the tree
In reply to Dmitry Eremin-SolenikovThere is no point in downloading a tarball with no clear upstream (other than icecc itself) and then patching it. Rather put new script in the source tree.
--- .../icecc-create-env-native/icecc-create-env | 192 ++++++++++++++++++++ .../icecc-create-env-native/icecc-lto-update.patch | 103 ----------- .../icecc-create-env-native_0.1.bb | 8 +- 3 files changed, 194 insertions(+), 109 deletions(-) create mode 100755 meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-create-env delete mode 100644 meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch
meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-create-env new file +192 -0
@@ -0,0 +1,192 @@ +#! /usr/bin/env bash +# icecc -- A simple distributed compiler system +# +# Copyright (C) 2004 by the Icecream Authors +# GPL + +target_files= + +is_contained () +{ + case " $target_files " in + *" $1 "* ) return 0 ;; + *"=$1 "* ) return 0;; + * ) return 1 ;; + esac +} + +add_file () +{ + local name="$1" + local path="$1"; + if test -n "$2"; then + name="$2" + fi + test -z "$name" && return + # ls -H isn't really the same as readlink, but + # readlink is not portable enough. + path=`ls -H $path` + toadd="$name=$path" + is_contained "$toadd" && return + if test -z "$silent"; then + echo "adding file $toadd" + fi + target_files="$target_files $toadd" + if test -x "$path"; then + # Only call ldd when it makes sense + if file -L "$path" | grep 'ELF' > /dev/null 2>&1; then + if ! file -L "$path" | grep 'static' > /dev/null 2>&1; then + # ldd now outputs ld as /lib/ld-linux.so.xx on current nptl based glibc + # this regexp parse the outputs like: + # ldd /usr/bin/gcc + # linux-gate.so.1 => (0xffffe000) + # libc.so.6 => /lib/tls/libc.so.6 (0xb7e81000) + # /lib/ld-linux.so.2 (0xb7fe8000) + # covering both situations ( with => and without ) + for lib in `ldd "$path" | sed -n 's,^[^/]*\(/[^ ]*\).*,\1,p'`; do + test -f "$lib" || continue + # Check wether the same library also exists in the parent directory, + # and prefer that on the assumption that it is a more generic one. + local baselib=`echo "$lib" | sed 's,\(/[^/]*\)/.*\(/[^/]*\)$,\1\2,'` + test -f "$baselib" && lib=$baselib + add_file "$lib" + done + fi + fi + fi +} + +# backward compat +if test "$1" = "--respect-path"; then + shift +fi + +#add a --silent switch to avoid "broken pipe" errors when calling this scipt from within OE +if test "$1" = "--silent"; then + silent=1 + shift +fi + + +added_gcc=$1 +shift +added_gxx=$1 +shift +added_as=$1 +shift +archive_name=$1 + +if test -z "$added_gcc" || test -z "$added_gxx" ; then + echo "usage: $0 <gcc_path> <g++_path>" + exit 1 +fi + +if ! test -x "$added_gcc" ; then + echo "'$added_gcc' is no executable." + exit 1 +fi + +if ! test -x "$added_gxx" ; then + echo "'$added_gcc' is no executable." + exit 1 +fi + + + +add_file $added_gcc /usr/bin/gcc +add_file $added_gxx /usr/bin/g++ + +if test -z "$added_as" ; then + add_file /usr/bin/as /usr/bin/as +else + if ! test -x "$added_as" ; then + echo "'$added_as' is no executable." + exit 1 + fi + + add_file $added_as /usr/bin/as +fi + +add_file `$added_gcc -print-prog-name=cc1` /usr/bin/cc1 +add_file `$added_gxx -print-prog-name=cc1plus` /usr/bin/cc1plus +specfile=`$added_gcc -print-file-name=specs` +if test -n "$specfile" && test -e "$specfile"; then + add_file "$specfile" +fi + +ltofile=`$added_gcc -print-prog-name=lto1` +pluginfile="${ltofile%lto1}liblto_plugin.so" +if test -r "$pluginfile" +then + add_file $pluginfile ${pluginfile#*usr} + add_file $pluginfile /usr${pluginfile#*usr} +fi + +tempdir=`mktemp -d /tmp/iceccenvXXXXXX` +new_target_files= +for i in $target_files; do + case $i in + *=/*) + target=`echo $i | cut -d= -f1` + path=`echo $i | cut -d= -f2` + ;; + *) + path=$i + target=$i + ;; + esac + mkdir -p $tempdir/`dirname $target` + cp -p $path $tempdir/$target + if test -f $tempdir/$target -a -x $tempdir/$target; then + strip -s $tempdir/$target 2>/dev/null + fi + target=`echo $target | cut -b2-` + new_target_files="$new_target_files $target" +done + +#sort the files +target_files=`for i in $new_target_files; do echo $i; done | sort` + +#test if an archive name was supplied +#if not use the md5 of all files as the archive name +if test -z "$archive_name"; then + md5sum=NONE + for file in /usr/bin/md5sum /bin/md5 /usr/bin/md5; do + if test -x $file; then + md5sum=$file + break + fi + done + + #calculate md5 and use it as the archive name + archive_name=`for i in $target_files; do test -f $tempdir/$i && $md5sum $tempdir/$i; done | sed -e 's/ .*$//' | $md5sum | sed -e 's/ .*$//'`.tar.gz || { + if test -z "$silent"; then + echo "Couldn't compute MD5 sum." + fi + exit 2 + } + mydir=`pwd` +else + mydir="`dirname "$archive_name"`" + + #check if we have a full path or only a filename + if test "$mydir" = "." ; then + mydir=`pwd` + else + mydir="" + fi +fi + +if test -z "$silent"; then +echo "creating $archive_name" +fi + +cd $tempdir +tar -czhf "$mydir/$archive_name" $target_files || { + if test -z "$silent"; then + echo "Couldn't create archive" + fi + exit 3 +} +cd .. +rm -rf $tempdir
meta/recipes-devtools/icecc-create-env/icecc-create-env-native/icecc-lto-update.patch deleted +0 -103
103 lines not on this page · raw message
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb +2 -6
@@ -7,7 +7,7 @@ PRIORITY = "optional" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://icecc-create-env;beginline=2;endline=5;md5=ae1df3d6a058bfda40b66094c5f6065f" -PR = "r1" +PR = "r2" DEPENDS = "" INHIBIT_DEFAULT_DEPS = "1"
@@ -15,8 +15,7 @@ INHIBIT_DEFAULT_DEPS = "1" inherit native PATCHTOOL = "patch" -SRC_URI = "http://www.digital-opsis.com/openembedded/icecc-create-env-${PV}.tar.gz \ - file://icecc-lto-update.patch " +SRC_URI = "file://icecc-create-env" S = "${WORKDIR}"
@@ -24,6 +23,3 @@ do_install() { install -d ${D}/${bindir} install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir} } - -SRC_URI[md5sum] = "641ec45fe377529c7fd914f77b11b44f" -SRC_URI[sha256sum] = "9ff8360375432a7a5c476cc6d55b3fdea9d6f3edc080d295a60421d8f47b1834"
Signature · 1 line
1.7.2.5
PATCH 7/10 gcc: fix possible problems with nscd compilation during eglibc-nativesdk build
In reply to Dmitry Eremin-SolenikovLong time ago a066e7ca90a28d5681c5fa895a29e999ed7c88b was committed to address possible problems with compilation of nscd during eglibc-nativesdk build. Problems were related to the way gcc searches for headers to check if it should enable it's own stack smash protection bits or it can relay on eglibc for it.
However after 934d38530c9a67562e53d4034aee5531f0f26750 things got broken, as for gcc-crosssdk-intermediate packages:
1) EXTRA_OECONF is ignored
2) headers are installed in a different location than expected by that patch.
This results in eglibc-nativesdk build broken on some systems (e.g. mine Debian x86_64 squeeze). Fix that by providing with-headers options to crosssdk-intermediate gcc configuration.
--- meta/recipes-devtools/gcc/gcc-4.5.1.inc | 2 +- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- .../gcc/gcc-crosssdk-intermediate.inc | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-devtools/gcc/gcc-4.5.1.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r10" +PR = "r11" DEPENDS =+ "mpfr gmp libmpc elfutils" NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native elfutils-native"
meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r11" +PR = "r12" # 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-crosssdk-intermediate.inc +2 -0
@@ -7,3 +7,5 @@ SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native" DEPENDS += "virtual/${TARGET_PREFIX}libc-initial-nativesdk" PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate-crosssdk" + +EXTRA_OECONF += " --with-headers=${STAGING_DIR_TCBOOTSTRAP}${SYSTEMHEADERS} "
Signature · 1 line
1.7.2.5
PATCH 8/10 gcc: include libgcov.a into libgcc-dev package
In reply to Dmitry Eremin-SolenikovFrom: lumag <[email protected]>
First, this lib is usefull for coverage analysis-enabled building. Second, this fixes the warning about unpackaged files in libgcc recipe.
--- meta/recipes-devtools/gcc/gcc-4.5.1.inc | 2 +- meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +- meta/recipes-devtools/gcc/libgcc_4.5.1.bb | 1 + meta/recipes-devtools/gcc/libgcc_4.6.bb | 1 + 4 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-devtools/gcc/gcc-4.5.1.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r11" +PR = "r12" DEPENDS =+ "mpfr gmp libmpc elfutils" NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native elfutils-native"
meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r12" +PR = "r13" # 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/libgcc_4.5.1.bb +1 -0
@@ -12,6 +12,7 @@ FILES_${PN} = "${base_libdir}/libgcc*.so.*" FILES_${PN}-dev = " \ ${base_libdir}/libgcc*.so \ ${libdir}/${TARGET_SYS}/${BINV}/crt* \ + ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ ${libdir}/${TARGET_SYS}/${BINV}/libgcc*" do_configure[noexec] = "1"
meta/recipes-devtools/gcc/libgcc_4.6.bb +1 -0
@@ -12,6 +12,7 @@ FILES_${PN} = "${base_libdir}/libgcc*.so.*" FILES_${PN}-dev = " \ ${base_libdir}/libgcc*.so \ ${libdir}/${TARGET_SYS}/${BINV}/crt* \ + ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ ${libdir}/${TARGET_SYS}/${BINV}/libgcc*" do_configure[noexec] = "1"
Signature · 1 line
1.7.2.5
PATCH 9/10 gconf-dbus: packaging fixup
In reply to Dmitry Eremin-SolenikovBehave more like plain gconf: include a dtd and .la files into -dev package.
--- meta/recipes-gnome/gnome/gconf-dbus_705.bb | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-gnome/gnome/gconf-dbus_705.bb +3 -1
@@ -10,7 +10,7 @@ RPROVIDES_${PN}-dev = "gconf-dev" #SRCREV = "705" #PV = "2.16.0+svnr${SRCPV}" -PR = "r0" +PR = "r1" # This SVN repo is no longer available use a tarball mirror site until # we move to proper gconf recipe.
@@ -33,6 +33,8 @@ do_configure_prepend() { FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*" FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug" +FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd \ + ${libdir}/GConf-dbus/2/*.la" BBCLASSEXTEND = "native"
Signature · 1 line
1.7.2.5
PATCH 10/10 libffi: really populate -dev package
In reply to Dmitry Eremin-SolenikovAs per gcc PR 11147, libffi installs headers into a target dependent place (/usr/lib/....). Include a rule to include those files into libffi-dev package.
Reference: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11147
--- meta/recipes-gnome/libffi/libffi_3.0.9.bb | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-gnome/libffi/libffi_3.0.9.bb +3 -0
@@ -7,10 +7,13 @@ library really only provides the lowest, machine dependent layer of a fully feat A layer must exist above `libffi' that handles type conversions for values passed between the two languages." SRC_URI = "ftp://sourceware.org/pub/libffi/${BPN}-${PV}.tar.gz" +PR = "r1" + SRC_URI[md5sum] = "1f300a7a7f975d4046f51c3022fa5ff1" SRC_URI[sha256sum] = "589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa09cb778aaba64dc9eac37ab7e4e5d8" inherit autotools +FILES_${PN}-dev += "${libdir}/libffi-${PV}" BBCLASSEXTEND = "native"
Signature · 1 line
1.7.2.5
Please delay this patch for a while. Now I get the following warning in my build logs (If someone can tell me where the problem lies, that would help).
ERROR: Trying to resolve runtime dependency gconf resulted in conflicting PREFERRED_PROVIDER entries being found.
The providers found were: ['/home/users/mitya/OE/setup-scripts/sources/openembedded-core/meta/recipes-gnome/gnome/gconf-dbus_705.bb', 'virtual:native:/home/users/mitya/OE/setup-scripts/sources/openembedded-core/meta/recipes-gnome/gnome/gconf-dbus_705.bb'] The PREFERRED_PROVIDER entries resulting in this conflict were: ['PREFERRED_PROVIDER_gconf = gconf-dbus', 'PREFERRED_PROVIDER_gconf-native = gconf-dbus-native']
NOTE: multiple providers are available for runtime gconf (gconf-dbus-native, gconf-dbus, gconf)
NOTE: consider defining a PREFERRED_PROVIDER entry to match gconf
Quoted 17 lines · Dmitry Eremin-Solenikov
Signed-off-by Dmitry Eremin-Solenikov<[email protected]>--- meta/conf/distro/include/default-providers.inc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)meta/conf/distro/include/default-providers.inc +1
-0@@ -22,6 +22,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" +PREFERRED_PROVIDER_gconf-native ?= "gconf-dbus-native" PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf" PREFERRED_PROVIDER_libgcc ?= "libgcc" PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
Quoted 1 line · Dmitry Eremin-Solenikov
Please delay this patch for a while.
Too late :(.
Quoted 4 lines
Now I get the following warning in
my build logs (If someone can tell me where the problem lies, that would help).
Quoted 11 lines
ERROR: Trying to resolve runtime dependency gconf resulted in
conflictingPREFERRED_PROVIDERentries being found.
The providers found were:
['/home/users/mitya/OE/setup-scripts/sources/openembedded-core/meta/recipes-gnome/gnome/gconf-dbus_705.bb', 'virtual:native:/home/users/mitya/OE/setup-scripts/sources/openembedded-core/meta/recipes-gnome/gnome/gconf-dbus_705.bb'] ThePREFERRED_PROVIDERentries resulting in this conflict were:
['PREFERRED_PROVIDER_gconf= gconf-dbus',
'PREFERRED_PROVIDER_gconf-native = gconf-dbus-native']
NOTE: multiple providers are available for runtime gconf
(gconf-dbus-native, gconf-dbus, gconf)
NOTE: consider defining aPREFERRED_PROVIDERentry to match gconf
This asks the question why is gconf-dbus-native providing "gconf" and not "gconf-native"?
Cheers,
Richard