Re: [OE-core] [PATCH 3/9] gcc-cross: Make gcc-cross-initial as the only intermediate gcc stage
Hi Khem, On Aug 25, 2012, at 1:59 AM, Khem Raj wrote: > On Friday, August 24, 2012, Elvis Dowson wrote: > > > > On Aug 25, 2012, at 1:10 AM, Khem Raj wrote: > > > >> On Fri, Aug 24, 2012 at 2:08 PM, Elvis Dowson > >> wrote: > >>> > >>> I'm adapting my earlier gcc-4.5 recipes, to try and get them to build with > >>> the latest poky master. > >>> > >>> I'm using eglibc-2.13, so it is possible for this version to drop the > >>> gcc-cross-intermediate stage, or is it only with newer eglibc versions? > >>> > >> > >> well it wont work with anything older than eglibc 2.16 > > > > What should I do to get the gcc-4.5 recipes to continue to build, with > > eglib-2.13, > > against the poky master branch? Should I retain the gcc-intermediate > > recipes? > > Back port some patches I did for eglibc 2.16 and drop intermediate recipes I've back ported the patches you did for eglibc-2.16 for eglibc-2.13, to use with my gcc-4.5 recipe, for the PowerPC 440 target. With that patch applied, in a local copy of my meta-openembedded/toolchain-layer, containing both the eglibc-2.13 and gcc-4.5, recipe, building against the poky/master commit id works: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=b0faebd1f07e1616004bd19664395932e7c2c48f gcc-cross: Make gcc-cross-initial as the only intermediate gcc stage I am able to get to the shell prompt, and get no crashes upto this point. The root file system seems to be working fine, and I am able to ping the host machine. It is with the application of the next patch, that I get a an init crash on the console, as I have been seeing earlier. http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=48df3fe947c4d900aa6b66d9d8352c0d9e59ebe4 eglibc: Fix eglibc-initial and let eglibc depend on it I've narrowed down the init problem, to the application of the above patch, but I'm unable to figure out why it is failing. Any suggestions? Best regards, Elvis Dowson ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pulseaudio: ensure X11 and consolekit are disabled
When DISTRO_FEATURES does not include X11 ensure that both x11
and gtk are diabled correctly. ConsoleKit also has x11, so ensure
that any RDEPENDS is also excluded.
The flags for x11 changed at somepoint to use enable/disable, but
this recipe was not updated.
Signed-off-by: Saul Wold
---
meta/recipes-multimedia/pulseaudio/pulseaudio.inc |7 ---
.../pulseaudio/pulseaudio_2.1.bb |2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 753b013..3003eaa 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -27,7 +27,7 @@ EXTRA_OECONF = "\
--disable-lynx \
${@base_contains('DISTRO_FEATURES', 'bluetooth',
'--enable-bluez', '--disable-bluez', d)} \
--disable-polkit \
- ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x',
'--without-x', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-x11',
'--disable-x11 --disable-gtk2', d)} \
--without-jack \
--with-glib \
--with-alsa \
@@ -117,7 +117,6 @@ python populate_packages_prepend() {
do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s',
'PulseAudio library for %s', extra_depends='' )
}
-RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
RDEPENDS_pulseaudio-server = " \
pulseaudio-module-filter-apply \
pulseaudio-module-filter-heuristics \
@@ -137,7 +136,9 @@ RDEPENDS_pulseaudio-server = " \
pulseaudio-module-rescue-streams \
pulseaudio-module-always-sink \
pulseaudio-module-suspend-on-idle \
-pulseaudio-module-console-kit \
pulseaudio-module-position-event-sounds \
pulseaudio-module-role-cork "
+RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
+RDEPENDS_pulseaudio-server += "\
+${@base_contains('DISTRO_FEATURES', 'x11',
'pulseaudio-module-console-kit', '', d)}"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
index 947aa6d..1c2c9f7 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
@@ -1,6 +1,6 @@
require pulseaudio.inc
-PR = "r5"
+PR = "r6"
DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] poky-tiny: Update the default kernel to linux-yocto-tiny_3.4
The 3.4 linux-yocto-tiny kernel successfully boots to a prompt for qemux86. Signed-off-by: Darren Hart --- meta-yocto/conf/distro/poky-tiny.conf |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf index 3196fa0..d40748e 100644 --- a/meta-yocto/conf/distro/poky-tiny.conf +++ b/meta-yocto/conf/distro/poky-tiny.conf @@ -37,7 +37,7 @@ DISTRO = "poky-tiny" # Distro config is evaluated after the machine config, so we have to explicitly # set the kernel provider to override a machine config. PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" -PREFERRED_VERSION_linux-yocto-tiny = "3.2%" +PREFERRED_VERSION_linux-yocto-tiny = "3.4%" # We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny #POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot" -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] linux-yocto-tiny: Add tiny recipe for the 3.4 linux-yocto kernel
This recipe builds the "tiny" kernel type defined by the linux-yocto
meta-data. Support is defined for the qemux86 machine via
common-pc-tiny.scc in the linux-yocto meta branch. The resulting
kernel is 1.8 MB and boots to a serial console with with qemux86 and
core-image-minimal using the following command:
qemu -kernel tmp/deploy/images/bzImage-qemux86.bin -initrd
tmp/deploy/images/core-image-minimal-qemux86.cpio.gz -append "root=/dev/ram0
console=ttyS0" -nographic
Signed-off-by: Darren Hart
---
meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 26 +
1 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
new file mode 100644
index 000..ce9a12f
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -0,0 +1,26 @@
+require recipes-kernel/linux/linux-yocto.inc
+
+# We need lzma (as CONFIG_KERNEL_LZMA=y)
+DEPENDS += "xz-native"
+
+KBRANCH_DEFAULT = "standard/tiny/base"
+KBRANCH = "${KBRANCH_DEFAULT}"
+LINUX_KERNEL_TYPE = "tiny"
+KCONFIG_MODE = "--allnoconfig"
+
+LINUX_VERSION ?= "3.4.11"
+
+KMETA = "meta"
+
+SRCREV_machine ?= "3fa06aa29078fdb2af431de2d3fdae7d281ba85f"
+SRCREV_meta ?= "5bdc655034a58a7147176a8a882d81e2fd51e4b9"
+
+PR = "${INC_PR}.2"
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+SRC_URI =
"git://git.yoctoproject.org/linux-yocto-3.4;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
+
+COMPATIBLE_MACHINE = "(qemux86)"
+
+# Functionality flags
+KERNEL_FEATURES = ""
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Update poky-tiny to linux-yocto-tiny_3.4 for qemux86
As these patches are dependent on eachother, sending to both poky and oe-core lists. Flame away. The refresh to 3.4 for tiny is coming in rather late as I was focused on other BSPs. However, qemux86 has been at 3.4 for poky and linux-yocto for a while now. This update effectively uses a subset of that tested config for the images built with poky-tiny. This only impacts qemux86 on poky-tiny. That configuration builds and boots to the serial console. NOTE: This kernel recipe is pending a minor meta-data change to the linux-yocto_3.4 git repository which will require a SRCREV_meta update. That update can be made to only the linux-yocto-tiny_3.4 recipe in order to minimize risk to the rest of the system. However, please do not commit this until the meta-data patch goes in. At that point I will update the branch with the new SRCREV and notify the list in response to this email. The following changes since commit 415be864abdbd6f86e554aba684f5d7a9499e2e7: sstate: Add extra entries to the sstate duplicate files whitelist (2012-10-05 16:18:26 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib dvhart/1.3/tiny http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dvhart/1.3/tiny Darren Hart (2): linux-yocto-tiny: Add tiny recipe for the 3.4 linux-yocto kernel poky-tiny: Update the default kernel to linux-yocto-tiny_3.4 meta-yocto/conf/distro/poky-tiny.conf |2 +- meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 26 + 2 files changed, 27 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC 0/7] Postinstall improvements
On Fri, Oct 5, 2012 at 8:39 AM, Laurentiu Palcu wrote: >>> >>> ROOTFS_POSTPROCESS_COMMAND ?= "run_intercept_scriptlets" >>> by >>> ROOTFS_POSTPROCESS_COMMAND =+ "run_intercept_scriptlets;" >>> >>> an now see larger caches for all my icon themes. But the sizes are >>> still different from those mentioned above. Will run-test tomorrow. >>> >>> Andreas >> Hey Laurentiu, >> >> With the minor change mentioned above I tested all my working images >> without issues. Thanks for taking care and speeding up first boot. > > Thanks Andreas for your help with the tests and for finding the issue. > Unfortunately the patches will not be able to get into 1.3 (we're a > little late for that). I'll prepare another patch-set as soon as I'll > find some spare time and, hopefully, we'll get the patches in for 1.4. > > Thanks, > Laurentiu > >> >> Andreas >> Although I would like to get this in I agree. Meanwhile I will put the modified patches in on one of my build machines to get further experience with them. Andreas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/6] denzil pull request 3
On Fri, Oct 5, 2012 at 2:52 PM, Scott Garman wrote: > > nightly-ppc-lsb: kernel compile failure > http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc-lsb/builds/82 > > kernel do_compile failure for mpc8315e_rdb-poky-linux: > > | BOOTCC arch/powerpc/boot/cuboot-pq2.o > | In file included from > /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc-lsb/build/build/tmp/work/mpc8315e_rdb-poky-linux/linux-yocto-3.0.32+git1+34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23_1+83f422f718cf15633cb4c2d309aa041c3c354f65-r4/linux/arch/powerpc/boot/epapr.c:20:0: > | arch/powerpc/boot/libfdt.h:854:1: error: unterminated comment > | arch/powerpc/boot/libfdt.h:1:0: error: unterminated #ifndef > | BOOTCC arch/powerpc/boot/cuboot-sequoia.o > | make[3]: *** [arch/powerpc/boot/epapr.o] Error 1 > | make[3]: *** Waiting for unfinished jobs > | make[2]: *** [uImage] Error 2 > | make[1]: *** [sub-make] Error 2 > | make: *** [all] Error 2 > | ERROR: oe_runmake failed > NOTE: package > linux-yocto-3.0.32+git1+34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23_1+83f422f718cf15633cb4c2d309aa041c3c354f65-r4: > task do_compile: Failed > > I heard from Matthew McClintock that a fix for this has been sent > upstream, sounds like we need to get this merged to our kernel tree. FYI, http://patchwork.ozlabs.org/patch/182260/ -M ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] openjade-native: fix undefined Getopts error, use std namespace
From: Dennis Lan
Using Gentoo Linux as the build host, it fails without this patch
Use Getopt::Std in place of getopts.pl.
https://bugs.gentoo.org/show_bug.cgi?id=420083
which following error:
/usr/bin/perl -w ./../msggen.pl -l jstyleModule InterpreterMessages.msg
/usr/bin/perl -w ./../msggen.pl -l jstyleModule DssslAppMessages.msg
Undefined subroutine &main::Getopts called at ./../msggen.pl line 22.
make[2]: *** [InterpreterMessages.h] Error 2
make[2]: *** Waiting for unfinished jobs
Undefined subroutine &main::Getopts called at ./../msggen.pl line 22.
make[2]: *** [DssslAppMessages.h] Error 2
(from OE-Core rev 169a89b10817b742c063fcd76721e4dbbcca6199)
Signed-off-by: Dennis Lan
Signed-off-by: Richard Purdie
---
.../openjade/openjade-1.3.2/msggen.pl.patch| 44
.../openjade/openjade-native_1.3.2.bb |3 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
b/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
new file mode 100644
index 000..b47fd46
--- /dev/null
+++ b/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch
@@ -0,0 +1,44 @@
+commit fcc5b94f118495b1a467edcda6c6f631691c3f69
+Author: Dennis Lan
+Date: Tue Jul 3 09:25:42 2012 +0800
+
+openjade: fix undefined Getopts error, use std namespace
+
+Using Gentoo Linux as the build host, it fails without this patch
+Use Getopt::Std in place of getopts.pl.
+
+Upstream-Status: Inappropriate [no upstream]
+Original-Author-By: Mike Gilbert
+Signed-off-by: Dennis Lan
+
+diff --git a/msggen.pl b/msggen.pl
+index 0c33968..2ee3f66 100644
+--- a/msggen.pl
b/msggen.pl
+@@ -4,6 +4,7 @@
+ # See the file COPYING for copying permission.
+
+ use POSIX;
++use Getopt::Std;
+
+ # Package and version.
+ $package = 'openjade';
+@@ -18,8 +19,7 @@ $gen_c = 0;
+ undef $opt_l;
+ undef $opt_p;
+ undef $opt_t;
+-do 'getopts.pl';
+-&Getopts('l:p:t:');
++getopts('l:p:t:');
+ $module = $opt_l;
+ $pot_file = $opt_p;
+
+@@ -72,7 +72,7 @@ while () {
+ else {
+ $field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");;
+ $type[$num] = substr($field[0], 0, 1);
+- $argc = int(substr($field[0], 1, 1));
++ $argc = substr($field[0], 1, 1);
+ }
+ $nargs[$num] = $argc;
+ $field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ || &error("invalid tag");
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index cd6a5aa..266210d 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -7,13 +7,14 @@ SECTION = "base"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
-PR = "r4"
+PR = "r5"
DEPENDS = "opensp-native sgml-common-native"
RDEPENDS_${PN} = "sgml-common-native"
SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
file://makefile.patch \
+ file://msggen.pl.patch \
file://reautoconf.patch \
file://user-declared-default-constructor.patch"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] siteconfig: Clear cache before rebuilding
From: Richard Purdie
This ensures consistent build results and avoids build failures when compiler
flags
change for example.
(From OE-Core rev: a5ff8396cad130f809f8f8da49bb38e6f80f923c)
Signed-off-by: Richard Purdie
---
meta/classes/siteconfig.bbclass |1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/siteconfig.bbclass b/meta/classes/siteconfig.bbclass
index ccbe5b9..3701b7c 100644
--- a/meta/classes/siteconfig.bbclass
+++ b/meta/classes/siteconfig.bbclass
@@ -18,6 +18,7 @@ siteconfig_do_siteconfig_gencache () {
>${WORKDIR}/site_config_${MACHINE}/configure.ac
cd ${WORKDIR}/site_config_${MACHINE}
autoconf
+ rm -f ${PN}_cache
CONFIG_SITE="" ${EXTRASITECONFIG} ./configure ${CONFIGUREOPTS}
--cache-file ${PN}_cache
sed -n -e "/ac_cv_c_bigendian/p" -e "/ac_cv_sizeof_/p" \
-e "/ac_cv_type_/p" -e "/ac_cv_header_/p" -e "/ac_cv_func_/p" \
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] openssl: add deprecated and unmaintained find.pl from perl-5.14 to fix perlpath.pl
From: Martin Jansa
* openembedded-core/meta/recipes-connectivity/openssl/openssl.inc
*
* is using perlpath.pl:
*
* do_configure () {
* cd util
* perl perlpath.pl ${STAGING_BINDIR_NATIVE}
* ...
*
* and perlpath.pl is using find.pl:
* openssl-1.0.0i/util/perlpath.pl:
* #!/usr/local/bin/perl
* #
* # modify the '#!/usr/local/bin/perl'
* # line in all scripts that rely on perl.
* #
*
* require "find.pl";
* ...
*
* which was removed in perl-5.16.0 and marked as deprecated and
* unmaintained in 5.14 and older:
* /tmp/usr/lib/perl5/5.14.2/find.pl:
* warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl
* core distribution in the next major release. Please install it from the
* CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]},
* line @{[(caller)[2]]}.\n";
*
* # This library is deprecated and unmaintained. It is included for
* # compatibility with Perl 4 scripts which may use it, but it will be
* # removed in a future version of Perl. Please use the File::Find module
* # instead.
(from OE-Core rev c09bf5d177a7ecd2045ef7e13fff4528137a9775)
Signed-off-by: Martin Jansa
---
.../openssl/openssl-1.0.0i/find.pl | 54
.../recipes-connectivity/openssl/openssl_1.0.0i.bb |7 ++-
2 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-connectivity/openssl/openssl-1.0.0i/find.pl
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0i/find.pl
b/meta/recipes-connectivity/openssl/openssl-1.0.0i/find.pl
new file mode 100644
index 000..8e1b42c
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/find.pl
@@ -0,0 +1,54 @@
+warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core
distribution in the next major release. Please install it from the CPAN
distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line
@{[(caller)[2]]}.\n";
+
+# This library is deprecated and unmaintained. It is included for
+# compatibility with Perl 4 scripts which may use it, but it will be
+# removed in a future version of Perl. Please use the File::Find module
+# instead.
+
+# Usage:
+# require "find.pl";
+#
+# &find('/foo','/bar');
+#
+# sub wanted { ... }
+# where wanted does whatever you want. $dir contains the
+# current directory name, and $_ the current filename within
+# that directory. $name contains "$dir/$_". You are cd'ed
+# to $dir when the function is called. The function may
+# set $prune to prune the tree.
+#
+# For example,
+#
+# find / -name .nfs\* -mtime +7 -exec rm -f {} \; -o -fstype nfs -prune
+#
+# corresponds to this
+#
+# sub wanted {
+# /^\.nfs.*$/ &&
+# (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) &&
+# int(-M _) > 7 &&
+# unlink($_)
+# ||
+# ($nlink || (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_))) &&
+# $dev < 0 &&
+# ($prune = 1);
+# }
+#
+# Set the variable $dont_use_nlink if you're using AFS, since AFS cheats.
+
+use File::Find ();
+
+*name = *File::Find::name;
+*prune = *File::Find::prune;
+*dir = *File::Find::dir;
+*topdir= *File::Find::topdir;
+*topdev= *File::Find::topdev;
+*topino= *File::Find::topino;
+*topmode = *File::Find::topmode;
+*topnlink = *File::Find::topnlink;
+
+sub find {
+&File::Find::find(\&wanted, @_);
+}
+
+1;
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
b/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
index ca15a38..c233ba1 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux"
CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
@@ -29,6 +29,7 @@ SRC_URI += "file://configure-targets.patch \
file://debian/no-symbolic.patch \
file://debian/debian-targets.patch \
file://openssl_fix_for_x32.patch \
+file://find.pl \
"
SRC_URI[md5sum] = "b4df9c11af454fd68178c85a1d5f328f"
@@ -43,3 +44,7 @@ FILES_${PN}-engines = "${libdir}/ssl/engines/*.so
${libdir}/engines"
FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
PARALLEL_MAKEINST = ""
+
+do_configure_prepend() {
+ cp ${WORKDIR}/find.pl ${S}/util/find.pl
+}
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] classes/cml1: ensure -c menuconfig forces a rebuild next time
From: Paul Eggleton
Ensure the following results in the kernel being rebuilt, repackaged and
re-deployed in the final step:
bitbake virtual/kernel
bitbake -c menuconfig virtual/kernel
[ make changes to the kernel configuration and save ]
bitbake virtual/kernel
If there are no changes to the configuration saved, the rebuild will not
be triggered.
Note that this relies on a function recently added to BitBake and
requires full hashing (i.e. BB_SIGNATURE_HANDLER must be set to a
signature handler that inherits from BasicHash) - if this is not the
case or the function is not available in the version of BitBake being
used this change will do nothing.
Fixes [YOCTO #2256].
(From OE-Core rev: 9bf6b60e1599cf5dd87089d42584583cdfd6807a)
Signed-off-by: Paul Eggleton
Signed-off-by: Richard Purdie
---
meta/classes/cml1.bbclass | 16
1 file changed, 16 insertions(+)
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index d429188..678d23c 100644
--- a/meta/classes/cml1.bbclass
+++ b/meta/classes/cml1.bbclass
@@ -10,7 +10,23 @@ addtask configure after do_unpack do_patch before do_compile
inherit terminal
python do_menuconfig() {
+try:
+mtime = os.path.getmtime(".config")
+except OSError:
+mtime = 0
+
oe_terminal("make menuconfig", '${PN} Configuration', d)
+
+# FIXME this check can be removed when the minimum bitbake version has
been bumped
+if hasattr(bb.build, 'write_taint'):
+try:
+newmtime = os.path.getmtime(".config")
+except OSError:
+newmtime = 0
+
+if newmtime > mtime:
+bb.note("Configuration changed, recompile will be forced")
+bb.build.write_taint('do_compile', d)
}
do_menuconfig[nostamp] = "1"
addtask menuconfig after do_configure
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] gnutls: Update SRC_URI to use GNU_MIRROR
From: Darren Hart
The current SRC_URI fails. Update it with the GNU_MIRROR SRC_URI from
upstream commit 753b22012f10c393c191d3116b9d38ee4be6d112.
Signed-off-by: Darren Hart
CC: John Howard
CC: Scott Garman
---
meta/recipes-support/gnutls/gnutls.inc |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/gnutls/gnutls.inc
b/meta/recipes-support/gnutls/gnutls.inc
index 157612e..e818f07 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gnutls/";
BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls";
DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap readline"
-INC_PR = "r6"
+INC_PR = "r7"
LICENSE = "GPLv3+ & LGPLv2.1+"
LICENSE_${PN} = "LGPLv2.1+"
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://lib/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://libextra/COPYING;md5=d32239bcb673463ab874e80d47fae504"
-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2";
+SRC_URI = "${GNU_MIRROR}/gnutls/gnutls-${PV}.tar.bz2"
inherit autotools binconfig pkgconfig gettext
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] udev: don't mount with -o sync
From: Jesse Zhang
mount.sh mounts all partitions with -o sync, which is bad for system
performance.
(From OE-Core rev: d49cf73754150b50a911d326aaa666f5da78855c)
Signed-off-by: Jesse Zhang
Signed-off-by: Richard Purdie
---
meta/recipes-core/udev/udev/mount.sh |2 +-
meta/recipes-core/udev/udev_164.bb |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/udev/udev/mount.sh
b/meta/recipes-core/udev/udev/mount.sh
index 53fefa3..c13b8bb 100644
--- a/meta/recipes-core/udev/udev/mount.sh
+++ b/meta/recipes-core/udev/udev/mount.sh
@@ -23,7 +23,7 @@ automount() {
! test -d "/media/$name" && mkdir -p "/media/$name"
- if ! $MOUNT -t auto -o sync $DEVNAME "/media/$name"
+ if ! $MOUNT -t auto $DEVNAME "/media/$name"
then
#logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME
\"/media/$name\" failed!"
rm_dir "/media/$name"
diff --git a/meta/recipes-core/udev/udev_164.bb
b/meta/recipes-core/udev/udev_164.bb
index c5813ec..0462ff2 100644
--- a/meta/recipes-core/udev/udev_164.bb
+++ b/meta/recipes-core/udev/udev_164.bb
@@ -1,6 +1,6 @@
include udev.inc
-PR = "r13"
+PR = "r14"
SRC_URI += "file://udev-166-v4l1-1.patch"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] denzil pull request 3
Hello, This is a pull request for denzil, it includes an important fix for the kernel menuconfig sstate bug. The poky-based tree has been run through the autobuilder as follows: nightly-x86: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-x86/builds/755 nightly-x86-lsb: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-x86-lsb/builds/83 nightly-x86-64: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-x86-64/builds/680 nightly-x86-64-lsb: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-x86-64-lsb/builds/81 nightly-arm: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/680 nightly-arm-lsb: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-arm-lsb/builds/79 nightly-mips: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-mips/builds/653 nightly-mips-lsb: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-mips-lsb/builds/80 nightly-ppc: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc/builds/634 nightly-ppc-lsb: kernel compile failure http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc-lsb/builds/82 kernel do_compile failure for mpc8315e_rdb-poky-linux: | BOOTCC arch/powerpc/boot/cuboot-pq2.o | In file included from /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-ppc-lsb/build/build/tmp/work/mpc8315e_rdb-poky-linux/linux-yocto-3.0.32+git1+34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23_1+83f422f718cf15633cb4c2d309aa041c3c354f65-r4/linux/arch/powerpc/boot/epapr.c:20:0: | arch/powerpc/boot/libfdt.h:854:1: error: unterminated comment | arch/powerpc/boot/libfdt.h:1:0: error: unterminated #ifndef | BOOTCC arch/powerpc/boot/cuboot-sequoia.o | make[3]: *** [arch/powerpc/boot/epapr.o] Error 1 | make[3]: *** Waiting for unfinished jobs | make[2]: *** [uImage] Error 2 | make[1]: *** [sub-make] Error 2 | make: *** [all] Error 2 | ERROR: oe_runmake failed NOTE: package linux-yocto-3.0.32+git1+34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23_1+83f422f718cf15633cb4c2d309aa041c3c354f65-r4: task do_compile: Failed I heard from Matthew McClintock that a fix for this has been sent upstream, sounds like we need to get this merged to our kernel tree. nightly-non-gpl3: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/312 nightly-multilib: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-multilib/builds/308 nightly-tiny: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-tiny/builds/289 build-appliance: bootdirectdisk failure http://autobuilder.yoctoproject.org:8010/builders/build-appliance/builds/83/steps/shell_43/logs/stdio | ERROR: Function failed: build_boot_dd (see /srv/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/build/build/tmp/work/qemux86_64-poky-linux/build-appliance-image-1.0-r16/temp/log.do_bootdirectdisk.25692 for further information) | install: cannot stat `/srv/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/build/build/tmp/sysroots/qemux86-64/kernel/bzImage': No such file or directory NOTE: package build-appliance-image-1.0-r16: task do_bootdirectdisk: Failed eclipse-plugin: Green http://autobuilder.yoctoproject.org:8010/builders/eclipse-plugin/builds/611 crownbay: Green http://autobuilder.yoctoproject.org:8010/builders/crownbay/builds/222 crownbay-noemgd: Green http://autobuilder.yoctoproject.org:8010/builders/crownbay-noemgd/builds/223 emenlow: Green http://autobuilder.yoctoproject.org:8010/builders/emenlow/builds/206 n450: Green http://autobuilder.yoctoproject.org:8010/builders/n450/builds/209 jasperforest: Green http://autobuilder.yoctoproject.org:8010/builders/jasperforest/builds/204 sugarbay: Green http://autobuilder.yoctoproject.org:8010/builders/sugarbay/builds/216 fri2-noemgd: Green http://autobuilder.yoctoproject.org:8010/builders/fri2-noemgd/builds/218 fri2: Green http://autobuilder.yoctoproject.org:8010/builders/fri2/builds/233 romley: Green http://autobuilder.yoctoproject.org:8010/builders/romley/builds/180 cedartrail: Green http://autobuilder.yoctoproject.org:8010/builders/cedartrail/builds/185 sys940x: do_rootfs failure http://autobuilder.yoctoproject.org:8010/builders/sys940x/builds/80 | Processing rpm... | error: Failed dependencies: | libva.so.1 is needed by libegl1-1.10-r0.core2 | libva-tpi.so.1 is needed by libegl1-1.10-r0.core2 | libva-x11.so.1 is needed by libegl1-1.10-r0.core2 NOTE: package core-image-sato-1.0-r0: task do_rootfs: Failed | Processing task-core-x11-base... | error: Failed dependencies: | libva.so.1 is needed by libegl1-1.10-r0.core2 | libva-tpi.so.1 is needed by libegl1-1.10-r0.core2 | libva-x11.so.1 is needed by libegl1-1.10-r0.core2 NOTE: package core-image-sato-sdk-1.0-r0: task do_rootfs: Failed sys940x-noemgd: Green http://autobuilder.yoctoproject.org:8010/builders/sys940x-noemgd/builds/79 The following changes since commit 032bd9a856f9ca0b43dff272bd4f9
[OE-core] [PATCH] package_rpm.bbclass: Fix an issue where complementary installs fail
From: Mark Hatle
Also ensure that we always cleanup the temporary install manifest files,
some of them will cause problems if they exist in multiple install
attempts.
Finally verify that the lists remain uniquely sorted otherwise the
complementary install may install the same files numerous times,
triggering a failure.
Signed-off-by: Mark Hatle
Signed-off-by: Saul Wold
---
meta/classes/package_rpm.bbclass | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index c491775..1ff92ce 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -324,11 +324,15 @@ package_install_internal_rpm () {
rm -f $m
fi
done
+ sort -u ${target_rootfs}/install/original_solution.manifest -o
${target_rootfs}/install/original_solution.manifest.new
+ mv ${target_rootfs}/install/original_solution.manifest.new
${target_rootfs}/install/original_solution.manifest
fi
# Setup manifest of packages to install...
mkdir -p ${target_rootfs}/install
rm -f ${target_rootfs}/install/install.manifest
+ rm -f ${target_rootfs}/install/install_multilib.manifest
+ rm -f ${target_rootfs}/install/install_attemptonly.manifest
# Uclibc builds don't provide this stuff...
if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ]
; then
@@ -428,7 +432,7 @@ package_install_internal_rpm () {
fi
# Now that we have a solution, pull out a list of what to install...
- echo "Manifest: ${target_rootfs}/install/install.manifest"
+ echo "Manifest: ${target_rootfs}/install/install_solution.manifest"
${RPM} -D "_dbpath ${target_rootfs}/install" -qa --qf
"%{packageorigin}\n" \
--root "${target_rootfs}/install" \
-D "__dbi_txn create nofsync private" \
@@ -459,8 +463,8 @@ package_install_internal_rpm () {
fi
- cat ${target_rootfs}/install/install_solution.manifest >
${target_rootfs}/install/total_solution.manifest
- cat ${target_rootfs}/install/install_multilib_solution.manifest >>
${target_rootfs}/install/total_solution.manifest
+ cat ${target_rootfs}/install/install_solution.manifest \
+ ${target_rootfs}/install/install_multilib_solution.manifest | sort
-u > ${target_rootfs}/install/total_solution.manifest
# Construct install scriptlet wrapper
cat << EOF > ${WORKDIR}/scriptlet_wrapper
@@ -521,8 +525,8 @@ EOF
if [ "${INSTALL_COMPLEMENTARY_RPM}" = "1" ] ; then
# Only install packages not already installed (dependency
calculation will
# almost certainly have added some that have been)
- sort ${target_rootfs}/install/original_solution.manifest >
${target_rootfs}/install/original_solution_sorted.manifest
- sort ${target_rootfs}/install/total_solution.manifest >
${target_rootfs}/install/total_solution_sorted.manifest
+ sort -u ${target_rootfs}/install/original_solution.manifest >
${target_rootfs}/install/original_solution_sorted.manifest
+ sort -u ${target_rootfs}/install/total_solution.manifest >
${target_rootfs}/install/total_solution_sorted.manifest
comm -2 -3
${target_rootfs}/install/total_solution_sorted.manifest \
${target_rootfs}/install/original_solution_sorted.manifest > \
${target_rootfs}/install/diff.manifest
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] Minor fixes
On 10/03/2012 05:37 AM, Paul Eggleton wrote: The following changes since commit eb96be4db46039752c44dc37ef676eaac04e3dba: xf86-video-intel: drop libxvmc dependency (2012-10-03 12:41:03 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/fixes2 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes2 Paul Eggleton (2): buildhistory_analysis: update to use explode_dep_versions2() rpmresolve: fix reporting of multiple matches error meta/lib/oe/buildhistory_analysis.py | 23 + meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c |6 +++--- meta/recipes-devtools/rpm/rpmresolve_1.0.bb |2 +- 3 files changed, 23 insertions(+), 8 deletions(-) Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] shutdown-desktop: ensure the postinst script succeeds
On 10/04/2012 04:37 AM, Ross Burton wrote:
When the hostname isn't qemuarm the grep fails so the postinst fails. Stop this
happening by explicitly evaluating true.
[YOCTO #3224]
Signed-off-by: Ross Burton
---
meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
index d0f507e..c5096c1 100644
--- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
+++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
SRC_URI = "file://shutdown.desktop"
+PR = "r1"
+
S = "${WORKDIR}"
do_install() {
@@ -14,7 +16,8 @@ do_install() {
pkg_postinst_${PN} () {
grep -q qemuarm $D${sysconfdir}/hostname && \
-sed -i $D${datadir}/applications/shutdown.desktop -e
's/^Exec=halt/Exec=reboot/'
+sed -i $D${datadir}/applications/shutdown.desktop -e
's/^Exec=halt/Exec=reboot/' \
+|| true
}
inherit allarch
Merged into OE-Core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] sato-icon-theme: use gtk-icon-cache helper class
On 10/04/2012 04:19 AM, Ross Burton wrote:
Instead of explicitly updating the icon cache use the helper class that also
forces a loader update at the same time. This eliminates the possibility of
updating the icon cache without any gdk-pixbuf loaders.
Also check that the Sato icon theme isn't already set to avoid appending to the
file every time the postinst runs.
[YOCTO #2399]
Signed-off-by: Ross Burton
---
meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc | 15 +++
.../sato-icon-theme/sato-icon-theme_0.4.1.bb|2 +-
2 files changed, 8 insertions(+), 9 deletions(-)
Merged into OE-Core
Thanks
Sau!
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
index 9fd1012..0bd4814 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
@@ -8,18 +8,17 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
SECTION = "x11"
DEPENDS = ""
-inherit autotools pkgconfig allarch
+inherit autotools pkgconfig allarch gtk-icon-cache
FILES_${PN} += "${datadir}"
EXTRA_OECONF +=
"--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
-#explictly setting "Sato" as default icon theme to avoid icon missing due to
-#tricky race condition
+# Explictly setting "Sato" as the default icon theme to avoid flickering from
+# the desktop and settings daemon racing. This shouldn't be done here but in
the sato image
pkg_postinst_${PN} () {
-if [ "x$D" != "x" ]; then
-exit 1
-fi
-gtk-update-icon-cache -q /usr/share/icons/Sato
-echo 'gtk-icon-theme-name = "Sato"' >> /etc/gtk-2.0/gtkrc
+mkdir -p $D/etc/gtk-2.0
+
+grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \
+echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc
}
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
index 108f8e8..6405359 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
@@ -2,7 +2,7 @@ require sato-icon-theme.inc
DEPENDS += "icon-naming-utils-native"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
file://iconpath-option.patch \
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] build-appliance-image: Fix spacing in DESCRIPTION
On 10/03/2012 07:53 AM, Paul Eggleton wrote: Fixes [YOCTO #2636] Signed-off-by: Paul Eggleton --- meta/recipes-core/images/build-appliance-image.bb |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/images/build-appliance-image.bb b/meta/recipes-core/images/build-appliance-image.bb index 69a4828..49e250d 100644 --- a/meta/recipes-core/images/build-appliance-image.bb +++ b/meta/recipes-core/images/build-appliance-image.bb @@ -1,4 +1,5 @@ -DESCRIPTION = "An image you can boot and run using either the VMware Player or VMware Workstation. For more information, see theBuild Appliance page." +DESCRIPTION = "An image you can boot and run using either the VMware Player or VMware Workstation.\ + For more information, see the Build Appliance page." IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-ssh-openssh packagegroup-self-hosted" LICENSE = "MIT" Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] common-licenses: Adding bzip
On 10/03/2012 12:41 PM, Flanagan, Elizabeth wrote: bzip requires it's own specific license. Signed-off-by: Elizabeth Flanagan --- meta/files/common-licenses/bzip | 41 +++ 1 file changed, 41 insertions(+) create mode 100644 meta/files/common-licenses/bzip Merged into OE-Core Thanks Sau! diff --git a/meta/files/common-licenses/bzip b/meta/files/common-licenses/bzip new file mode 100644 index 000..2162888 --- /dev/null +++ b/meta/files/common-licenses/bzip @@ -0,0 +1,41 @@ +-- + +This program, "bzip2", the associated library "libbzip2", and all +documentation, are copyright (C) 1996-2010 Julian R Seward. All +rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + +3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + +4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Julian Seward, jsew...@bzip.org +bzip2/libbzip2 version 1.0.6 of 6 September 2010 + +-- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/3] runqemu multiple unfs instances fix
On 10/03/2012 03:13 PM, Scott Garman wrote: Hello, Here's a bugfix to allow multiple instances of unfs-based qemu to run. A bit thank you to Rudolf J Streif for proposing the final commit in this series. Scott The following changes since commit ae9dbd0e1e26ba2b35cbd08ec731aee62adedc23: distrodata: Update distrocheck functions (2012-10-03 17:37:24 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib sgarman/runqemu-unfs-fix-oe http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/runqemu-unfs-fix-oe Scott Garman (3): runqemu-export-rootfs: use consistent whitespace runqemu-export-rootfs: improve rpcbind error detection runqemu: allow multiple unfs instances to run simultaneously scripts/runqemu-export-rootfs | 113 +++-- scripts/runqemu-internal |4 +- 2 files changed, 66 insertions(+), 51 deletions(-) Merged these into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] toolchain-scripts.bbclass: Export M4
On 10/04/2012 04:47 PM, Khem Raj wrote:
some packages use M4 variable from environment and sometimes
its hardcoded to /usr/bin/m4 if not found in environment. Lets
define it such that it is picked from path
Signed-off-by: Khem Raj
---
meta/classes/toolchain-scripts.bbclass |1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/toolchain-scripts.bbclass
b/meta/classes/toolchain-scripts.bbclass
index 44284c3..6d8623c 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -26,6 +26,7 @@ toolchain_create_sdk_env_script () {
echo 'export OBJDUMP=${TARGET_PREFIX}objdump' >> $script
echo 'export AR=${TARGET_PREFIX}ar' >> $script
echo 'export NM=${TARGET_PREFIX}nm' >> $script
+ echo 'export M4=m4' >> $script
echo 'export TARGET_PREFIX=${TARGET_PREFIX}' >> $script
echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS}
--build=${SDK_ARCH}-linux --with-libtool-sysroot=${SDKTARGETSYSROOT}"' >> $script
if [ "${TARGET_OS}" = "darwin8" ]; then
Merged into OE-Core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH] autotools: Fix race over aclocal macro directory
The previous steps taken to address races over the aclocal macro directory and
the removal
of files hasn't been sufficient since aclocal still looks at that directory as
part of its
default search path. This patch passes the aclocal-copy directory into aclocal
as its system
directory, removing any chance of it accessing the original aclocal directory.
Hopefully this should therefore fix the race issues once and for all.
In order to do this, cp-noerror needs to not error if the directory already
exists.
Its also been noticed that aclocal defaults to using STAGING_DATADIR_NATIVE
even when
building for the target. Only using the target directory would cause errors
such as
missing pkgconfig macros (since we only depend on pkgconfig-native, not
pkgconfig).
This patch processes both sets of macros maintaining existing behaviour. At a
future
date we could look into potentially optimising this.
[YOCTO #3216]
Signed-off-by: Richard Purdie
---
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index e4e034b..23058be 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -127,6 +127,7 @@ autotools_do_configure() {
cd ${S}
# Remove any previous copy of the m4 macros
rm -rf ${B}/aclocal-copy/
+ ACLOCAL="aclocal --system-acdir=${B}/aclocal-copy/"
if [ x"${acpaths}" = xdefault ]; then
acpaths=
for i in `find ${S} -maxdepth 2 -name \*.m4|grep -v
'aclocal.m4'| \
@@ -145,11 +146,16 @@ autotools_do_configure() {
# The aclocal directory could get modified by other processes
# uninstalling data from the sysroot. See Yocto #861 for
details.
# We avoid this by taking a copy here and then files cannot
disappear.
+ mkdir -p ${B}/aclocal-copy/
if [ -d ${STAGING_DATADIR}/aclocal ]; then
# for scratch build this directory can be empty
# so avoid cp's no files to copy error
- cp-noerror ${STAGING_DATADIR}/aclocal ${B}/aclocal-copy/
- acpaths="$acpaths -I ${B}/aclocal-copy/"
+ cp-noerror ${STAGING_DATADIR}/aclocal/
${B}/aclocal-copy/
+ fi
+ if [ -d ${STAGING_DATADIR_NATIVE}/aclocal ]; then
+ # for scratch build this directory can be empty
+ # so avoid cp's no files to copy error
+ cp-noerror ${STAGING_DATADIR_NATIVE}/aclocal/
${B}/aclocal-copy/
fi
# autoreconf is too shy to overwrite aclocal.m4 if it doesn't
look
# like it was auto-generated. Work around this by blowing it
away
@@ -185,7 +191,7 @@ autotools_do_configure() {
intltoolize --copy --force --automake
fi
bbnote Executing autoreconf --verbose --install --force
${EXTRA_AUTORECONF} $acpaths
- autoreconf -Wcross --verbose --install --force
${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed."
+ ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install
--force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed."
cd $olddir
fi
if [ -e ${S}/configure ]; then
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] scripts/cp-noerror: Copy the code from shutils.copytree, update not to error if the mkdir fails
Signed-off-by: Richard Purdie --- diff --git a/scripts/cp-noerror b/scripts/cp-noerror index fdb3d2d..f0cd243 100755 --- a/scripts/cp-noerror +++ b/scripts/cp-noerror @@ -5,10 +5,38 @@ # import sys +import os import shutil +def copytree(src, dst, symlinks=False, ignore=None): +"""Based on shutil.copytree""" +names = os.listdir(src) +try: +os.makedirs(dst) +except OSError: +# Already exists +pass +errors = [] +for name in names: +srcname = os.path.join(src, name) +dstname = os.path.join(dst, name) +try: +shutil.copy2(srcname, dstname) +# catch the Error from the recursive copytree so that we can +# continue with other files +except shutil.Error, err: +errors.extend(err.args[0]) +except EnvironmentError, why: +errors.append((srcname, dstname, str(why))) +try: +shutil.copystat(src, dst) +except OSError, why: +errors.extend((src, dst, str(why))) +if errors: +raise shutil.Error, errors + try: -shutil.copytree(sys.argv[1], sys.argv[2]) +copytree(sys.argv[1], sys.argv[2]) except shutil.Error: pass ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libdrm: Explicitly disable the cairo dependency
On Fri, 2012-10-05 at 12:54 +0100, Phil Blundell wrote: > On Fri, 2012-10-05 at 12:47 +0100, Richard Purdie wrote: > > diff --git a/meta/recipes-graphics/drm/libdrm/nocairo.patch > > b/meta/recipes-graphics/drm/libdrm/nocairo.patch > > new file mode 100644 > > index 000..f9b7f3a > > --- a/dev/null > > +++ b/meta/recipes-graphics/drm/libdrm/nocairo.patch > > @@ -0,0 +1,39 @@ > > +We don't want the cairo dependency. Unfortunately simply checking whether > > its present > > +isn't good enough. If its not in DEPENDS, it can disappear half way > > through building. > > +We therefore need to explictly disable it. > > + > > +RP > > +2012/10/5 > > + > > +Index: libdrm-2.4.39/configure.ac > > This new patch seems to be missing Upstream-Status and Signed-off-by. The rule is that it has author information which I did include. Admittedly "RP" is a little cryptic but I think people can figure it out by now and its an established convention for me by now. I've questioned the rational of Signed-off-by in this context before but it seems people find it easier and it doesn't particularly bother me... As for the Upstream-Status, I should have included that and will add it, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sstate: Add extra entries to the sstate duplicate files whitelist
This avoids errors where gcc/binutils get installed to the native sysroot
in the same location for multiple package architectures. Ultimately making
these native recipes with ${PACKAGE_ARCH} appended to PN will resolve this
but hide the warnings until this gets sorted out.
Also hide the python and docbook catalog warnings since they're known about,
nothing to worry about and we'll aim to clean them up properly in the 1.4 cycle.
Signed-off-by: Richard Purdie
---
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index e820a2e..96a3765 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -19,9 +19,15 @@ SSTATE_PATHSPEC =
"${SSTATE_DIR}/${SSTATE_EXTRAPATHWILDCARD}*/${SSTATE_PKGSPEC
# In theory we should be using:
# SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/
${DEPLOY_DIR_IPK}/all/ ${DEPLOY_DIR_RPM}/all ${DEPLOY_DIR_DEB}/all/
${TMPDIR}/pkgdata/all${TARGET_VENDOR}-${TARGET_OS}"
-# However until do_package is not machine specific, we'll have to make do with
this:
+# However until do_package is not machine specific, we'll have to make do with
all of deploy/pkgdata.
SSTATE_DUPWHITELIST = "${DEPLOY_DIR}/ ${TMPDIR}/pkgdata/"
-
+# Also need to make cross recipes append to ${PN} and install once for any
given PACAGE_ARCH so
+# can avoid multiple installs (e.g. routerstationpro+qemumips both using
mips32)
+SSTATE_DUPWHITELIST += "${STAGING_LIBDIR_NATIVE}/${MULTIMACH_TARGET_SYS}
${STAGING_DIR_NATIVE}/usr/libexec/${MULTIMACH_TARGET_SYS}
${STAGING_BINDIR_NATIVE}/${MULTIMACH_TARGET_SYS}
${STAGING_DIR_NATIVE}${includedir_native}/gcc-build-internal-${MULTIMACH_TARGET_SYS}"
+# Also avoid python issues until we fix the python recipe
+SSTATE_DUPWHITELIST += "${STAGING_LIBDIR}/python2.7/config/Makefile
${STAGING_LIBDIR}/libpython2.7 ${STAGING_INCDIR}/python2.7/pyconfig.h"
+# Avoid docbook/sgml catalog warnings for now
+SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml"
SSTATE_SCAN_FILES ?= "*.la *-config *_config"
SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name
\"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f'
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sstate: Normalise paths before comparing with the whitelist
Without this, path components like // could break comparisons with the whitelist leading to warnings being displayed to the user unintentionally. Signed-off-by: Richard Purdie --- diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 03f083e..e820a2e 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -150,6 +150,7 @@ def sstate_install(ss, d): match = [] for f in sharedfiles: if os.path.exists(f): +f = os.path.normpath(f) realmatch = True for w in whitelist: if f.startswith(w): ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libdrm: Explicitly disable the cairo dependency
On Fri, Oct 5, 2012 at 8:47 AM, Richard Purdie wrote: > We don't want the cairo dependency. Unfortunately simply checking whether its > present > isn't good enough. If its not in DEPENDS, it can disappear half way through > building. > We therefore need to explicitly disable it. > > Signed-off-by: Richard Purdie Richard, Please use the Upstream-Status field in the patch so it is easier to track later. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Add support for running custom terminals. Example config: OE_TERMINAL = "custom" / OE_TERMINAL_CUSTOMCMD = "myterm"
Signed-off-by: Morten Minde Neergaard
---
meta/classes/terminal.bbclass |6 +++---
meta/lib/oe/terminal.py | 41 -
2 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index 3cfc84b..906fa58 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -4,7 +4,7 @@ OE_TERMINAL[choices] = 'auto none \
${@" ".join(o.name \
for o in oe.terminal.prioritized())}'
-OE_TERMINAL_EXPORTS = 'XAUTHORITY SHELL DBUS_SESSION_BUS_ADDRESS DISPLAY
EXTRA_OEMAKE SCREENDIR'
+OE_TERMINAL_EXPORTS += 'XAUTHORITY SHELL DBUS_SESSION_BUS_ADDRESS DISPLAY
EXTRA_OEMAKE SCREENDIR'
OE_TERMINAL_EXPORTS[type] = 'list'
XAUTHORITY ?= "${HOME}/.Xauthority"
@@ -25,7 +25,7 @@ def oe_terminal(command, title, d):
bb.fatal('Devshell usage disabled with OE_TERMINAL')
elif terminal != 'auto':
try:
-oe.terminal.spawn(terminal, command, title)
+oe.terminal.spawn(terminal, command, title, None, d)
return
except oe.terminal.UnsupportedTerminal:
bb.warn('Unsupported terminal "%s", defaulting to "auto"' %
@@ -34,7 +34,7 @@ def oe_terminal(command, title, d):
bb.fatal('Unable to spawn terminal %s: %s' % (terminal, exc))
try:
-oe.terminal.spawn_preferred(command, title)
+oe.terminal.spawn_preferred(command, title, None, d)
except oe.terminal.NoSupportedTerminals:
bb.fatal('No valid terminal found, unable to open devshell')
except oe.terminal.ExecutionError as exc:
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 30e8f92..91d5a66 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -27,7 +27,7 @@ class Registry(oe.classutils.ClassRegistry):
class Terminal(Popen):
__metaclass__ = Registry
-def __init__(self, sh_cmd, title=None, env=None):
+def __init__(self, sh_cmd, title=None, env=None, d=None):
fmt_sh_cmd = self.format_command(sh_cmd, title)
try:
Popen.__init__(self, fmt_sh_cmd, env=env)
@@ -46,8 +46,8 @@ class Terminal(Popen):
return [element.format(**fmt) for element in self.command]
class XTerminal(Terminal):
-def __init__(self, sh_cmd, title=None, env=None):
-Terminal.__init__(self, sh_cmd, title, env)
+def __init__(self, sh_cmd, title=None, env=None, d=None):
+Terminal.__init__(self, sh_cmd, title, env, d)
if not os.environ.get('DISPLAY'):
raise UnsupportedTerminal(self.name)
@@ -59,7 +59,7 @@ class Xfce(XTerminal):
command = 'Terminal -T "{title}" -e "{command}"'
priority = 2
-def __init__(self, command, title=None, env=None):
+def __init__(self, command, title=None, env=None, d=None):
# Upstream binary name is Terminal but Debian/Ubuntu use
# xfce4-terminal to avoid possible(?) conflicts
distro = distro_name()
@@ -67,20 +67,20 @@ class Xfce(XTerminal):
cmd = 'xfce4-terminal -T "{title}" -e "{command}"'
else:
cmd = command
-XTerminal.__init__(self, cmd, title, env)
+XTerminal.__init__(self, cmd, title, env, d)
class Konsole(XTerminal):
command = 'konsole -T "{title}" -e {command}'
priority = 2
-def __init__(self, sh_cmd, title=None, env=None):
+def __init__(self, sh_cmd, title=None, env=None, d=None):
# Check version
vernum = check_konsole_version("konsole")
if vernum:
if vernum.split('.')[0] == "2":
logger.debug(1, 'Konsole from KDE 4.x will not work as
devshell, skipping')
raise UnsupportedTerminal(self.name)
-XTerminal.__init__(self, sh_cmd, title, env)
+XTerminal.__init__(self, sh_cmd, title, env, d)
class XTerm(XTerminal):
command = 'xterm -T "{title}" -e {command}'
@@ -93,29 +93,44 @@ class Rxvt(XTerminal):
class Screen(Terminal):
command = 'screen -D -m -t "{title}" -S devshell {command}'
-def __init__(self, sh_cmd, title=None, env=None):
+def __init__(self, sh_cmd, title=None, env=None, d=None):
s_id = "devshell_%i" % os.getpid()
self.command = "screen -D -m -t \"{title}\" -S %s {command}" % s_id
-Terminal.__init__(self, sh_cmd, title, env)
+Terminal.__init__(self, sh_cmd, title, env, d)
logger.warn('Screen started. Please connect in another terminal with '
'"screen -r devshell %s"' % s_id)
+class Custom(Terminal):
+command = 'false' # This is a placeholder
+priority = 3
+
+def __init__(self, sh_cmd, title=None, env=None, d=None):
+self.command = d and d.getVar('OE_TERMINAL_CUSTOMCMD', True)
+if self.command:
+if not '{command}' in self.command:
+self.command += ' {command}'
+Terminal._
Re: [OE-core] [PATCH] libdrm: Explicitly disable the cairo dependency
On Fri, 2012-10-05 at 12:47 +0100, Richard Purdie wrote: > diff --git a/meta/recipes-graphics/drm/libdrm/nocairo.patch > b/meta/recipes-graphics/drm/libdrm/nocairo.patch > new file mode 100644 > index 000..f9b7f3a > --- a/dev/null > +++ b/meta/recipes-graphics/drm/libdrm/nocairo.patch > @@ -0,0 +1,39 @@ > +We don't want the cairo dependency. Unfortunately simply checking whether > its present > +isn't good enough. If its not in DEPENDS, it can disappear half way through > building. > +We therefore need to explictly disable it. > + > +RP > +2012/10/5 > + > +Index: libdrm-2.4.39/configure.ac This new patch seems to be missing Upstream-Status and Signed-off-by. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libdrm: Explicitly disable the cairo dependency
We don't want the cairo dependency. Unfortunately simply checking whether its
present
isn't good enough. If its not in DEPENDS, it can disappear half way through
building.
We therefore need to explicitly disable it.
Signed-off-by: Richard Purdie
---
diff --git a/meta/recipes-graphics/drm/libdrm.inc
b/meta/recipes-graphics/drm/libdrm.inc
index cc09791..2ed9c14 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -18,6 +18,8 @@ DEPENDS += " libpciaccess"
inherit autotools pkgconfig
+EXTRA_OECONF += "--disable-cairo"
+
PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-kms"
FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*"
FILES_${PN}-drivers = "${libdir}/libdrm_*.so.*"
diff --git a/meta/recipes-graphics/drm/libdrm/nocairo.patch
b/meta/recipes-graphics/drm/libdrm/nocairo.patch
new file mode 100644
index 000..f9b7f3a
--- a/dev/null
+++ b/meta/recipes-graphics/drm/libdrm/nocairo.patch
@@ -0,0 +1,39 @@
+We don't want the cairo dependency. Unfortunately simply checking whether its
present
+isn't good enough. If its not in DEPENDS, it can disappear half way through
building.
+We therefore need to explictly disable it.
+
+RP
+2012/10/5
+
+Index: libdrm-2.4.39/configure.ac
+===
+--- libdrm-2.4.39.orig/configure.ac2012-08-24 14:54:42.0 +
libdrm-2.4.39/configure.ac 2012-10-05 11:37:52.484821221 +
+@@ -63,6 +63,11 @@
+ [Disable KMS mm abstraction library (default: auto)]),
+ [LIBKMS=$enableval], [LIBKMS=auto])
+
++AC_ARG_ENABLE(cairo,
++AS_HELP_STRING([--disable-cairo],
++[Disable cairo (default: auto)]),
++[ENABLECAIRO=$enableval], [ENABLECAIRO=auto])
++
+ AC_ARG_ENABLE(intel,
+ AS_HELP_STRING([--disable-intel],
+ [Enable support for intel's KMS API (default: auto)]),
+@@ -201,9 +206,12 @@
+ AC_DEFINE(HAVE_EXYNOS, 1, [Have EXYNOS support])
+ fi
+
+-PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
+-if test "x$HAVE_CAIRO" = xyes; then
+- AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
++HAVE_CAIRO=no
++if test "x$ENABLECAIRO" = xyes; then
++ PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
++ if test "x$HAVE_CAIRO" = xyes; then
++ AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])
++ fi
+ fi
+ AM_CONDITIONAL(HAVE_CAIRO, [test "x$HAVE_CAIRO" = xyes])
+
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.39.bb
b/meta/recipes-graphics/drm/libdrm_2.4.39.bb
index 4e6a8d5..cb1f7f9 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.39.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.39.bb
@@ -4,6 +4,7 @@ PR = "${INC_PR}.0"
SRC_URI += "file://installtests.patch \
file://GNU_SOURCE_definition.patch \
+file://nocairo.patch \
"
SRC_URI[md5sum] = "9a299e021d81bab6c82307582c78319d"
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cross-canadian.bbclass: add native chrpath dependency
On Fri, 2012-10-05 at 13:22 +0300, Laurentiu Palcu wrote: > In order for the RPATHs in 32bit toolchain binaries to be relocated > properly, chrpath >=0.14 is needed. > > [YOCTO #3161] > [YOCTO #3201] > > Signed-off-by: Laurentiu Palcu > --- > meta/classes/cross-canadian.bbclass |7 +++ > 1 file changed, 7 insertions(+) Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Andrei Gherzan : busybox: Package hwclock.sh initscript separately
Strangely this worked for me... but indeed that was something i missed by
mistake. Thanks.
*ag*
On Tue, Oct 2, 2012 at 7:39 PM, Martin Jansa wrote:
> On Thu, Sep 27, 2012 at 10:52:31PM +0200, Martin Jansa wrote:
> > On Fri, Aug 17, 2012 at 05:09:34PM +, git@git.openembedded.orgwrote:
> > > Module: openembedded-core.git
> > > Branch: master
> > > Commit: b97e37e1444ef32e7837dcc79e3fad36c4284b65
> > > URL:
> http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b97e37e1444ef32e7837dcc79e3fad36c4284b65
> > >
> > > Author: Andrei Gherzan
> > > Date: Fri Aug 17 00:15:15 2012 +0300
> > >
> > > busybox: Package hwclock.sh initscript separately
> > >
> > > We package this separately to be able to pull this in only if this
> makes
> > > sense for the MACHINE.
> > >
> > > Signed-off-by: Andrei Gherzan
> > > Signed-off-by: Saul Wold
> > >
> > > ---
> > >
> > > meta/recipes-core/busybox/busybox.inc |5 +++--
> > > 1 files changed, 3 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/meta/recipes-core/busybox/busybox.inc
> b/meta/recipes-core/busybox/busybox.inc
> > > index 78239a2..5a5b383 100644
> > > --- a/meta/recipes-core/busybox/busybox.inc
> > > +++ b/meta/recipes-core/busybox/busybox.inc
> > > @@ -14,15 +14,16 @@ SECTION = "base"
> > > export EXTRA_CFLAGS = "${CFLAGS}"
> > > export EXTRA_LDFLAGS = "${LDFLAGS}"
> > >
> > > -PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog
> ${PN}-mdev"
> > > +PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog
> ${PN}-mdev ${PN}-hwclock"
> > >
> > > FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
> > > FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog*
> ${sysconfdir}/syslog-startup.conf*"
> > > FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf"
> > > FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
> > > FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc"
> > > +FILES_${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh"
> > >
> > > -INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd
> ${PN}-mdev"
> > > +INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd
> ${PN}-mdev ${PN}-hwclock""
> > >
> > > INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
> > > INITSCRIPT_NAME_${PN}-syslog = "syslog"
> >
> > Missing
> > INITSCRIPT_NAME_${PN}-hwclock = "hwclock.sh"
> > ?
> >
> > Did you test it?
> >
> > Here it fails like this:
> > Configuring busybox-hwclock.
> > usage: update-rc.d [-n] [-f] [-r ] remove
> >update-rc.d [-n] [-r ] [-s] defaults [NN | sNN
> kNN]
> >update-rc.d [-n] [-r ] [-s] start|stop NN runlvl
> [runlvl] [...] .
> > -n: not really
> > -f: force
> > -v: verbose
> > -r: alternate root path (default is /)
> > -s: invoke start methods if appropriate to current
> runlevel
> > Collected errors:
> > * pkg_run_script: package "busybox-hwclock" postinst script returned
> status 1.
> > * opkg_configure: busybox-hwclock.postinst returned 1.
> >
> > And indeed it's broken:
> > SHR root@qemux86-64 ~ $ cat /var/lib/opkg/info/busybox-hwclock.postinst
> > #!/bin/sh
> > if test "x$D" != "x"; then
> > OPT="-r $D"
> > else
> > OPT="-s"
> > fi
> > update-rc.d $OPT ${INITSCRIPT_NAME} defaults
> >
> > Cheers,
>
> Fixed now in master
> Module: openembedded-core.git
> Branch: master
> Commit: 43b4ffc11874803db37c43b521ce27c51c677c8b
> URL:
>
> http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=43b4ffc11874803db37c43b521ce27c51c677c8b
>
> Author: Richard Purdie
> Date: Tue Oct 2 17:24:08 2012 +0100
>
>
> --
> Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
>
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cross-canadian.bbclass: add native chrpath dependency
In order for the RPATHs in 32bit toolchain binaries to be relocated
properly, chrpath >=0.14 is needed.
[YOCTO #3161]
[YOCTO #3201]
Signed-off-by: Laurentiu Palcu
---
meta/classes/cross-canadian.bbclass |7 +++
1 file changed, 7 insertions(+)
diff --git a/meta/classes/cross-canadian.bbclass
b/meta/classes/cross-canadian.bbclass
index aec7301..47fb0ab 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -54,6 +54,13 @@ LDFLAGS = "${BUILDSDK_LDFLAGS} \
DEPENDS_GETTEXT = "gettext-native nativesdk-gettext"
+#
+# We need chrpath >= 0.14 to ensure we can deal with 32 and 64 bit
+# binaries
+#
+DEPENDS_append = " chrpath-replacement-native"
+EXTRANATIVEPATH += "chrpath-native"
+
# Path mangling needed by the cross packaging
# Note that we use := here to ensure that libdir and includedir are
# target paths.
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
