Re: [OE-core] [PATCH] perl: Allow perl to cross build and native build in a directory named t
Dear Jason Wessel, In message 1337749401-27198-1-git-send-email-jason.wes...@windriver.com you wrote: If any directory in leading up to your tmp directory has the name t perl will fail to build with a very cryptic error shown below: pod/buildtoc: no pods at pod/buildtoc line 305. make[1]: *** [pod/perltoc.pod] Error 255 This error message is missing in the patch itself: --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.2/perl-build-in-t-dir.patch @@ -0,0 +1,35 @@ +Upstream-Status:Pending + +Perl cannot cross build in a path containing a directory that +has the name of t. + +You get an error like: + + +Signed-off-by: Jason Wessel jason.wes...@windriver.com ... i. e. here. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de More software projects have gone awry for lack of calendar time than for all other causes combined. - Fred Brooks, Jr., _The Mythical Man Month_ ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] dropbear: fix include dependent PR generation
On 22.05.2012 16:16, Steffen Sledz wrote:
Signed-off-by: Steffen Sledz sl...@dresearch-fe.de
---
meta/recipes-core/dropbear/dropbear.inc|2 ++
meta/recipes-core/dropbear/dropbear_2012.55.bb |2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/dropbear/dropbear.inc
b/meta/recipes-core/dropbear/dropbear.inc
index 2d6aeb2..2de442c 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -2,6 +2,8 @@ DESCRIPTION = Dropbear is a lightweight SSH and SCP
implementation
HOMEPAGE = http://matt.ucc.asn.au/dropbear/dropbear.html;
SECTION = console/network
+INC_PR = r0
+
# some files are from other projects and have others license terms:
# public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY
LICENSE = MIT
diff --git a/meta/recipes-core/dropbear/dropbear_2012.55.bb
b/meta/recipes-core/dropbear/dropbear_2012.55.bb
index 4f0ef80..8323a33 100644
--- a/meta/recipes-core/dropbear/dropbear_2012.55.bb
+++ b/meta/recipes-core/dropbear/dropbear_2012.55.bb
@@ -3,4 +3,4 @@ require dropbear.inc
SRC_URI[md5sum] = 44836e5a0419ba12557f9ea46880077e
SRC_URI[sha256sum] =
808df243c61bb60f2f18fa64bca628cbba0918b2a14139f10e6d59d4ac5a17ce
-PR = r0
+PR = ${INC_PR}.0
Did this message made it to the ML?
I could not find it in Patchwork OpenEmbedded Core?. :(
Steffen
--
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:sl...@dresearch-fe.de
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gawk: update to 4.0.1
Signed-off-by: Radu Moisan radu.moi...@intel.com
---
.../gawk/{gawk_4.0.0.bb = gawk_4.0.1.bb} |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/gawk/{gawk_4.0.0.bb = gawk_4.0.1.bb} (86%)
diff --git a/meta/recipes-extended/gawk/gawk_4.0.0.bb
b/meta/recipes-extended/gawk/gawk_4.0.1.bb
similarity index 86%
rename from meta/recipes-extended/gawk/gawk_4.0.0.bb
rename to meta/recipes-extended/gawk/gawk_4.0.1.bb
index 977feb9..b986ebd 100644
--- a/meta/recipes-extended/gawk/gawk_4.0.0.bb
+++ b/meta/recipes-extended/gawk/gawk_4.0.1.bb
@@ -11,12 +11,12 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=d32239bcb673463ab874e80d47fae504
RDEPENDS_gawk += gawk-common
RDEPENDS_pgawk += gawk-common
-PR = r1
+PR = r0
SRC_URI = ${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz
-SRC_URI[md5sum] = 51e417b71287629940051e6f652c6492
-SRC_URI[sha256sum] =
c3a7cf7d976e05c6a1d8a9b3f14fa55d4304707408ddafb1396212653ea00be5
+SRC_URI[md5sum] = bab2bda483e9f32be65b43b8dab39fa5
+SRC_URI[sha256sum] =
476dee8bea8bc3b04af5cae502b83ea16edd5b703d20418918f8773889d78c80
inherit autotools gettext update-alternatives
--
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] curl: Update to version 7.25.0
Signed-off-by: Radu Moisan radu.moi...@intel.com
---
meta/recipes-support/curl/curl/noldlibpath.patch | 76
.../curl/{curl_7.24.0.bb = curl_7.25.0.bb}|5 +-
2 files changed, 2 insertions(+), 79 deletions(-)
delete mode 100644 meta/recipes-support/curl/curl/noldlibpath.patch
rename meta/recipes-support/curl/{curl_7.24.0.bb = curl_7.25.0.bb} (90%)
diff --git a/meta/recipes-support/curl/curl/noldlibpath.patch
b/meta/recipes-support/curl/curl/noldlibpath.patch
deleted file mode 100644
index f4c72a1..000
--- a/meta/recipes-support/curl/curl/noldlibpath.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling.
-Since we never run compiled binaries for the target, we should *never* need
-to change LD_LIBRARY_PATH.
-
-RP 9/6/2010
-
-Index: curl-7.20.0/configure.ac
-===
curl-7.20.0.orig/configure.ac 2010-06-09 11:06:30.0 +0100
-+++ curl-7.20.0/configure.ac 2010-06-09 11:04:25.0 +0100
-@@ -1461,9 +1461,10 @@
-dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH
-dnl to prevent further configure tests to fail due to this
-
-- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_OPENSSL
-- export LD_LIBRARY_PATH
-- AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
-+ #LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_OPENSSL
-+ #export LD_LIBRARY_PATH
-+ #AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
-+ :
- fi
- fi
-
-@@ -1684,9 +1686,10 @@
- dnl LD_LIBRARY_PATH to prevent further configure tests to fail
- dnl due to this
-
-- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$gtlslib
-- export LD_LIBRARY_PATH
-- AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
-+ #LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$gtlslib
-+ #export LD_LIBRARY_PATH
-+ #AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
-+ :
- fi
- fi
-
-@@ -1696,6 +1699,8 @@
-
- fi dnl OPENSSL != 1
-
-+AC_SUBST(GNUTLS_REQUIRED)
-+
- dnl
- dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
- dnl
-@@ -1781,9 +1786,10 @@
- dnl LD_LIBRARY_PATH to prevent further configure tests to fail
- dnl due to this
-
--LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$nssprefix/lib$libsuff
--export LD_LIBRARY_PATH
--AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
-+#LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$nssprefix/lib$libsuff
-+#export LD_LIBRARY_PATH
-+#AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
-+:
- fi
-
- fi
-@@ -1881,9 +1887,9 @@
-dnl libssh2_version is a post 1.0 addition
-AC_CHECK_FUNCS( libssh2_version )
-
-- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DIR_SSH2
-- export LD_LIBRARY_PATH
-- AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])
-+ #LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DIR_SSH2
-+ #export LD_LIBRARY_PATH
-+ #AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])
- fi
- else
- dnl no libssh2, revert back to clean variables
diff --git a/meta/recipes-support/curl/curl_7.24.0.bb
b/meta/recipes-support/curl/curl_7.25.0.bb
similarity index 90%
rename from meta/recipes-support/curl/curl_7.24.0.bb
rename to meta/recipes-support/curl/curl_7.25.0.bb
index 12e95c9..033f1bc 100644
--- a/meta/recipes-support/curl/curl_7.24.0.bb
+++ b/meta/recipes-support/curl/curl_7.25.0.bb
@@ -11,11 +11,10 @@ DEPENDS_virtclass-nativesdk = zlib-nativesdk
PR = r0
SRC_URI = http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
- file://noldlibpath.patch \
file://pkgconfig_fix.patch
-SRC_URI[md5sum] = f912221d75eb8d8fe08900eaf011b023
-SRC_URI[sha256sum] =
ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16
+SRC_URI[md5sum] = f0303d47d9d3e6e4f08c2863c6504823
+SRC_URI[sha256sum] =
cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491
inherit autotools pkgconfig binconfig
--
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 1/9] tar: fix build
On 2012-05-22 18:05, nitin.a.kam...@intel.com wrote:
From: Nitin A Kamblenitin.a.kam...@intel.com
Avoid this error:
| rmdir: failed to remove
`/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/tar-1.26-r1/image/usr/sbin/':
No such file or directory
NOTE: package tar-1.26-r1: task do_install: Failed
no PR bump as no change in the output.
Signed-off-by: Nitin A Kamblenitin.a.kam...@intel.com
---
meta/recipes-extended/tar/tar.inc |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/tar/tar.inc
b/meta/recipes-extended/tar/tar.inc
index 0533b82..5c2325a 100644
--- a/meta/recipes-extended/tar/tar.inc
+++ b/meta/recipes-extended/tar/tar.inc
@@ -18,8 +18,12 @@ do_install () {
do_install_extra () {
install -d ${D}${base_bindir}
mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
-rmdir ${D}${bindir}/
-rmdir ${D}${sbindir}/
+if [ -d ${D}${bindir}/ ] ; then
+rmdir ${D}${bindir}/
+fi
+if [ -d ${D}${sbindir}/ ] ; then
+rmdir ${D}${sbindir}/
+fi
mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
}
Why not just use
rm -fr ${D}${bindir}
etc? No need for all the extra testing...
--
Gary Thomas | Consulting for the
MLB Associates |Embedded world
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xz: updated to version 5.1.1alpha
From: valentin valentin@valentin-linux.(none)
The licenses are the same, only some white
spaces added/removed.
Signed-off-by: valentin valentin.p...@intel.com
---
.../xz/{xz_5.0.3.bb = xz_5.1.1alpha.bb} | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-extended/xz/{xz_5.0.3.bb = xz_5.1.1alpha.bb} (72%)
diff --git a/meta/recipes-extended/xz/xz_5.0.3.bb
b/meta/recipes-extended/xz/xz_5.1.1alpha.bb
similarity index 72%
rename from meta/recipes-extended/xz/xz_5.0.3.bb
rename to meta/recipes-extended/xz/xz_5.1.1alpha.bb
index e8f96b6..7fa7177 100644
--- a/meta/recipes-extended/xz/xz_5.0.3.bb
+++ b/meta/recipes-extended/xz/xz_5.1.1alpha.bb
@@ -4,17 +4,17 @@ SECTION = base
LICENSE = GPLv2+ GPLv3+ LGPLv2.1+
LIC_FILES_CHKSUM = file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
-file://COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe \
+file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
-
file://COPYING.LGPLv2.1;md5=fbc093901857fcd118f065f900982c24 \
+
file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84
SRC_URI = http://tukaani.org/xz/xz-${PV}.tar.gz;
-SRC_URI[md5sum] = fefe52f9ecd521de2a8ce38c21a27574
-SRC_URI[sha256sum] =
10eb4df72dffb2fb14c3d2d82b450e72282ffcb9ee3908a8e5b392b8f09681bf
+SRC_URI[md5sum] = bb24436fa12780808e1c142980484104
+SRC_URI[sha256sum] =
54e59a83690a4a0ec88a7d7c3bdef90c6b196c892a93463863c71c24fe87951a
-PR = r1
+PR = r0
inherit autotools 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] valgrind: Enable valgrind for omap3
Valgrind supports the armv7 architecture, this patch allows users of the omap3
soc family to build and use valgrind
This patch was run-tested on a Gumstix Overo (armv7a cortex-a8)
* The test consisted of running valgrinds memcheck (memory leakage detection),
* and callgrind (profiling) on a Qt 4 application
Signed-off-by: Samuel Stirtzel s.stirt...@googlemail.com
---
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index d7c7b24..0311d75 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -22,14 +22,17 @@ SRC_URI =
http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
SRC_URI[md5sum] = a855fda56edf05614f099dca316d1775
SRC_URI[sha256sum] =
5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
-COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
+COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux'
+COMPATIBLE_HOST_omap3 = 'arm.*-linux'
inherit autotools
EXTRA_OECONF = --enable-tls
+EXTRA_OECONF_omap3 = --enable-tls -host=armv7-none-linux-gnueabi
EXTRA_OEMAKE = -w
PARALLEL_MAKE =
FILES_${PN}-dbg += ${libdir}/${PN}/*/.debug/*
RRECOMMENDS_${PN}_powerpc += ${TCLIBC}-dbg
RRECOMMENDS_${PN}_powerpc64 += ${TCLIBC}-dbg
+RRECOMMENDS_${PN}_omap3 += libc6-dbg
\ No newline at end of file
--
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] [PATCH] valgrind: Enable valgrind for omap3
2012/5/23 Samuel Stirtzel s.stirt...@googlemail.com:
Valgrind supports the armv7 architecture, this patch allows users of the
omap3 soc family to build and use valgrind
This patch was run-tested on a Gumstix Overo (armv7a cortex-a8)
* The test consisted of running valgrinds memcheck (memory leakage detection),
* and callgrind (profiling) on a Qt 4 application
Signed-off-by: Samuel Stirtzel s.stirt...@googlemail.com
---
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb | 5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index d7c7b24..0311d75 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -22,14 +22,17 @@ SRC_URI =
http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
SRC_URI[md5sum] = a855fda56edf05614f099dca316d1775
SRC_URI[sha256sum] =
5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
-COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
+COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux'
Oops forgot to change this line back, v2 coming soon.
+COMPATIBLE_HOST_omap3 = 'arm.*-linux'
inherit autotools
EXTRA_OECONF = --enable-tls
+EXTRA_OECONF_omap3 = --enable-tls -host=armv7-none-linux-gnueabi
EXTRA_OEMAKE = -w
PARALLEL_MAKE =
FILES_${PN}-dbg += ${libdir}/${PN}/*/.debug/*
RRECOMMENDS_${PN}_powerpc += ${TCLIBC}-dbg
RRECOMMENDS_${PN}_powerpc64 += ${TCLIBC}-dbg
+RRECOMMENDS_${PN}_omap3 += libc6-dbg
\ No newline at end of file
--
1.7.5.4
--
Regards
Samuel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] valgrind: Enable valgrind for omap3
On Wed, May 23, 2012 at 02:23:19PM +0200, Samuel Stirtzel wrote:
2012/5/23 Samuel Stirtzel s.stirt...@googlemail.com:
Valgrind supports the armv7 architecture, this patch allows users of the
omap3 soc family to build and use valgrind
This patch was run-tested on a Gumstix Overo (armv7a cortex-a8)
* The test consisted of running valgrinds memcheck (memory leakage
detection),
* and callgrind (profiling) on a Qt 4 application
Signed-off-by: Samuel Stirtzel s.stirt...@googlemail.com
---
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb | 5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index d7c7b24..0311d75 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -22,14 +22,17 @@ SRC_URI =
http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
SRC_URI[md5sum] = a855fda56edf05614f099dca316d1775
SRC_URI[sha256sum] =
5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
-COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
+COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux'
Oops forgot to change this line back, v2 coming soon.
+COMPATIBLE_HOST_omap3 = 'arm.*-linux'
inherit autotools
EXTRA_OECONF = --enable-tls
+EXTRA_OECONF_omap3 = --enable-tls -host=armv7-none-linux-gnueabi
Why not for all armv7 machines?
Cheers,
EXTRA_OEMAKE = -w
PARALLEL_MAKE =
FILES_${PN}-dbg += ${libdir}/${PN}/*/.debug/*
RRECOMMENDS_${PN}_powerpc += ${TCLIBC}-dbg
RRECOMMENDS_${PN}_powerpc64 += ${TCLIBC}-dbg
+RRECOMMENDS_${PN}_omap3 += libc6-dbg
\ No newline at end of file
--
1.7.5.4
--
Regards
Samuel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] valgrind: Enable valgrind for omap3
2012/5/23 Martin Jansa martin.ja...@gmail.com:
On Wed, May 23, 2012 at 02:23:19PM +0200, Samuel Stirtzel wrote:
2012/5/23 Samuel Stirtzel s.stirt...@googlemail.com:
Valgrind supports the armv7 architecture, this patch allows users of the
omap3 soc family to build and use valgrind
This patch was run-tested on a Gumstix Overo (armv7a cortex-a8)
* The test consisted of running valgrinds memcheck (memory leakage
detection),
* and callgrind (profiling) on a Qt 4 application
Signed-off-by: Samuel Stirtzel s.stirt...@googlemail.com
---
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb | 5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index d7c7b24..0311d75 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -22,14 +22,17 @@ SRC_URI =
http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
SRC_URI[md5sum] = a855fda56edf05614f099dca316d1775
SRC_URI[sha256sum] =
5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
-COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
+COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64|arm).*-linux'
Oops forgot to change this line back, v2 coming soon.
+COMPATIBLE_HOST_omap3 = 'arm.*-linux'
inherit autotools
EXTRA_OECONF = --enable-tls
+EXTRA_OECONF_omap3 = --enable-tls -host=armv7-none-linux-gnueabi
Why not for all armv7 machines?
I've thought about that too, ok I will send the next patch with armv7.
But please keep in mind I only tested it on an omap3 device.
--
Regards
Samuel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] valgrind: Enable valgrind for armv7
Valgrind supports the armv7 architecture, this patch allows armv7 users to
build and use Valgrind
This patch was run-tested on a Gumstix Overo (armv7a cortex-a8)
* The test consisted of running valgrinds memcheck (memory leakage detection),
* and callgrind (profiling) on a Qt 4 application
Signed-off-by: Samuel Stirtzel s.stirt...@googlemail.com
---
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index d7c7b24..0998f72 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -23,13 +23,16 @@ SRC_URI[md5sum] = a855fda56edf05614f099dca316d1775
SRC_URI[sha256sum] =
5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
+COMPATIBLE_HOST_armv7a = 'arm.*-linux'
inherit autotools
EXTRA_OECONF = --enable-tls
+EXTRA_OECONF_armv7a = --enable-tls -host=armv7-none-linux-gnueabi
EXTRA_OEMAKE = -w
PARALLEL_MAKE =
FILES_${PN}-dbg += ${libdir}/${PN}/*/.debug/*
RRECOMMENDS_${PN}_powerpc += ${TCLIBC}-dbg
RRECOMMENDS_${PN}_powerpc64 += ${TCLIBC}-dbg
+RRECOMMENDS_${PN}_armv7a += libc6-dbg
--
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] [PATCH v2] valgrind: Enable valgrind for armv7
Op 23 mei 2012, om 14:46 heeft Samuel Stirtzel het volgende geschreven:
Valgrind supports the armv7 architecture, this patch allows armv7 users to
build and use Valgrind
This patch was run-tested on a Gumstix Overo (armv7a cortex-a8)
* The test consisted of running valgrinds memcheck (memory leakage detection),
* and callgrind (profiling) on a Qt 4 application
Signed-off-by: Samuel Stirtzel s.stirt...@googlemail.com
---
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index d7c7b24..0998f72 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -23,13 +23,16 @@ SRC_URI[md5sum] = a855fda56edf05614f099dca316d1775
SRC_URI[sha256sum] =
5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
+COMPATIBLE_HOST_armv7a = 'arm.*-linux'
inherit autotools
EXTRA_OECONF = --enable-tls
+EXTRA_OECONF_armv7a = --enable-tls -host=armv7-none-linux-gnueabi
we should already be passing --host through autotools.bbclass. Does the
configure have a special check? I've seen a few projects that insist on the
-none- TARGET_VENDOR for no good reason :(
EXTRA_OEMAKE = -w
PARALLEL_MAKE =
FILES_${PN}-dbg += ${libdir}/${PN}/*/.debug/*
RRECOMMENDS_${PN}_powerpc += ${TCLIBC}-dbg
RRECOMMENDS_${PN}_powerpc64 += ${TCLIBC}-dbg
+RRECOMMENDS_${PN}_armv7a += libc6-dbg
${TCLIBC}-dbg ?
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] valgrind: Enable valgrind for armv7
2012/5/23 Koen Kooi k...@dominion.thruhere.net:
Op 23 mei 2012, om 14:46 heeft Samuel Stirtzel het volgende geschreven:
Valgrind supports the armv7 architecture, this patch allows armv7 users to
build and use Valgrind
This patch was run-tested on a Gumstix Overo (armv7a cortex-a8)
* The test consisted of running valgrinds memcheck (memory leakage
detection),
* and callgrind (profiling) on a Qt 4 application
Signed-off-by: Samuel Stirtzel s.stirt...@googlemail.com
---
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index d7c7b24..0998f72 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -23,13 +23,16 @@ SRC_URI[md5sum] = a855fda56edf05614f099dca316d1775
SRC_URI[sha256sum] =
5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
+COMPATIBLE_HOST_armv7a = 'arm.*-linux'
inherit autotools
EXTRA_OECONF = --enable-tls
+EXTRA_OECONF_armv7a = --enable-tls -host=armv7-none-linux-gnueabi
we should already be passing --host through autotools.bbclass. Does the
configure have a special check? I've seen a few projects that insist on the
-none- TARGET_VENDOR for no good reason :(
At some extend yes, the configuration checks the host, the default
string passed is arm but the configure.in checks for:
case ${host_cpu} in
...
armv7*)
AC_MSG_RESULT([ok (${host_cpu})])
ARCH_MAX=arm
So if we use the default from autotools it won't work.
I've seen the arch in some examples on the net, do you prefer -host=armv7?
EXTRA_OEMAKE = -w
PARALLEL_MAKE =
FILES_${PN}-dbg += ${libdir}/${PN}/*/.debug/*
RRECOMMENDS_${PN}_powerpc += ${TCLIBC}-dbg
RRECOMMENDS_${PN}_powerpc64 += ${TCLIBC}-dbg
+RRECOMMENDS_${PN}_armv7a += libc6-dbg
${TCLIBC}-dbg ?
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Regards
Samuel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/19] xproto: upgrade to 7.0.23
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../{xproto_7.0.22.bb = xproto_7.0.23.bb} |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-proto/{xproto_7.0.22.bb = xproto_7.0.23.bb}
(72%)
diff --git a/meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb
b/meta/recipes-graphics/xorg-proto/xproto_7.0.23.bb
similarity index 72%
rename from meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb
rename to meta/recipes-graphics/xorg-proto/xproto_7.0.23.bb
index 8f76314..486e562 100644
--- a/meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb
+++ b/meta/recipes-graphics/xorg-proto/xproto_7.0.23.bb
@@ -8,7 +8,7 @@ System.
LICENSE = MIT MIT-style
LIC_FILES_CHKSUM = file://COPYING;md5=b9e051107d5628966739a0b2e9b32676
-PR = r1
+PR = r0
PE = 1
SRC_URI += file://xproto_fix_for_x32.patch
@@ -16,6 +16,6 @@ SRC_URI += file://xproto_fix_for_x32.patch
EXTRA_OECONF_append = --enable-specs=no
BBCLASSEXTEND = native nativesdk
-SRC_URI[md5sum] = da0b0eb2f432b7cc1d665b05422a0457
-SRC_URI[sha256sum] =
ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
+SRC_URI[md5sum] = d4d241a4849167e4e694fe73371c328c
+SRC_URI[sha256sum] =
ade04a0949ebe4e3ef34bb2183b1ae8e08f6f9c7571729c9db38212742ac939e
--
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 01/19] mdadm: upgrade to 3.2.5
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../mdadm/{mdadm_3.2.3.bb = mdadm_3.2.5.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/mdadm/{mdadm_3.2.3.bb = mdadm_3.2.5.bb} (85%)
diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.3.bb
b/meta/recipes-extended/mdadm/mdadm_3.2.5.bb
similarity index 85%
rename from meta/recipes-extended/mdadm/mdadm_3.2.3.bb
rename to meta/recipes-extended/mdadm/mdadm_3.2.5.bb
index 17cdd41..2d7e1d0 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.2.3.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.2.5.bb
@@ -14,8 +14,8 @@ SRC_URI =
${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
file://mdadm-3.2.2_fix_for_x32.patch \
-SRC_URI[md5sum] = d789d6ecb9c1d5ebcc64f0fc52bca92f
-SRC_URI[sha256sum] =
0ff49a04c6250834ce1b5be5a1581532e70e2221a87e1eedec46d6656b37ab40
+SRC_URI[md5sum] = 83ba4a6249ae24677e915e44c9cfcc58
+SRC_URI[sha256sum] =
5ae2bfd241c88601c1ef9072806248491e025fa09a388c40230d72d65eabbd3c
CFLAGS += -fno-strict-aliasing
--
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 00/19] Package updates
The updates in this patchset are mainly related to graphics functionality area.
The following changes since commit 33c4bf2096effc850720009564e3d1adbda24452:
fetch2: Also exclude urls containing wildcards from checksumming for now
(2012-05-22 12:18:53 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib lpalcu/updates
http://git.yoctoproject.org/cgit.cgi//log/?h=lpalcu/updates
Laurentiu Palcu (19):
mdadm: upgrade to 3.2.5
libdrm: upgrade to 2.4.34
xproto: upgrade to 7.0.23
kbproto: upgrade to 1.0.6
fontsproto: upgrade to 2.1.2
xextproto: upgrade to 7.2.1
xcmiscproto: upgrade to 1.2.2
scrnsaverproto: upgrade to 1.2.2
recordproto: upgrade to 1.14.2
xcb-proto: upgrade to 1.7.1
libxt: upgrade to 1.1.3
xtrans: upgrade to 1.2.7
fontconfig: upgrade to 2.9.0
libpciaccess: upgrade to 0.13.1
xf86-input-mouse: upgrade to 1.7.2
xf86-video-vesa: upgrade to 2.3.1
xf86-video-intel: upgrade to 2.19.0
xf86-input-synaptics: upgrade to 1.6.1
Update to distro_tracking_fields.inc
.../conf/distro/include/distro_tracking_fields.inc | 180 ++--
.../mdadm/{mdadm_3.2.3.bb = mdadm_3.2.5.bb} |4 +-
.../drm/{libdrm_2.4.31.bb = libdrm_2.4.34.bb} |4 +-
.../97_fontconfig |0
.../fix-pkgconfig.patch|4 +-
...-native_2.8.0.bb = fontconfig-native_2.9.0.bb} |0
.../{fontconfig_2.8.0.bb = fontconfig_2.9.0.bb} | 12 +-
.../xcb/{xcb-proto_1.7.bb = xcb-proto_1.7.1.bb} |4 +-
...ut-mouse_1.7.1.bb = xf86-input-mouse_1.7.2.bb} |4 +-
...tics_1.5.0.bb = xf86-input-synaptics_1.6.1.bb} |6 +-
...-intel_2.18.0.bb = xf86-video-intel_2.19.0.bb} |4 +-
...ideo-vesa_2.3.0.bb = xf86-video-vesa_2.3.1.bb} |6 +-
.../fix_deletion_of_last_handle.patch | 51 --
...ciaccess_0.12.902.bb = libpciaccess_0.13.1.bb} |6 +-
.../xorg-lib/{libxt_1.1.2.bb = libxt_1.1.3.bb}|4 +-
.../xorg-lib/{xtrans_1.2.6.bb = xtrans_1.2.7.bb} |4 +-
.../{fontsproto_2.1.1.bb = fontsproto_2.1.2.bb} |4 +-
.../{kbproto_1.0.5.bb = kbproto_1.0.6.bb} |6 +-
...recordproto_1.14.1.bb = recordproto_1.14.2.bb} |4 +-
...saverproto_1.2.1.bb = scrnsaverproto_1.2.2.bb} |5 +-
.../{xcmiscproto_1.2.1.bb = xcmiscproto_1.2.2.bb} |4 +-
.../{xextproto_7.2.0.bb = xextproto_7.2.1.bb} |4 +-
.../{xproto_7.0.22.bb = xproto_7.0.23.bb} |6 +-
23 files changed, 133 insertions(+), 193 deletions(-)
rename meta/recipes-extended/mdadm/{mdadm_3.2.3.bb = mdadm_3.2.5.bb} (85%)
rename meta/recipes-graphics/drm/{libdrm_2.4.31.bb = libdrm_2.4.34.bb} (62%)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.8.0 =
fontconfig-2.9.0}/97_fontconfig (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.8.0 =
fontconfig-2.9.0}/fix-pkgconfig.patch (84%)
rename meta/recipes-graphics/fontconfig/{fontconfig-native_2.8.0.bb =
fontconfig-native_2.9.0.bb} (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig_2.8.0.bb =
fontconfig_2.9.0.bb} (84%)
rename meta/recipes-graphics/xcb/{xcb-proto_1.7.bb = xcb-proto_1.7.1.bb} (61%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-mouse_1.7.1.bb =
xf86-input-mouse_1.7.2.bb} (76%)
rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.5.0.bb =
xf86-input-synaptics_1.6.1.bb} (79%)
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.18.0.bb =
xf86-video-intel_2.19.0.bb} (84%)
rename meta/recipes-graphics/xorg-driver/{xf86-video-vesa_2.3.0.bb =
xf86-video-vesa_2.3.1.bb} (74%)
delete mode 100644
meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch
rename meta/recipes-graphics/xorg-lib/{libpciaccess_0.12.902.bb =
libpciaccess_0.13.1.bb} (64%)
rename meta/recipes-graphics/xorg-lib/{libxt_1.1.2.bb = libxt_1.1.3.bb} (91%)
rename meta/recipes-graphics/xorg-lib/{xtrans_1.2.6.bb = xtrans_1.2.7.bb}
(82%)
rename meta/recipes-graphics/xorg-proto/{fontsproto_2.1.1.bb =
fontsproto_2.1.2.bb} (77%)
rename meta/recipes-graphics/xorg-proto/{kbproto_1.0.5.bb = kbproto_1.0.6.bb}
(68%)
rename meta/recipes-graphics/xorg-proto/{recordproto_1.14.1.bb =
recordproto_1.14.2.bb} (76%)
rename meta/recipes-graphics/xorg-proto/{scrnsaverproto_1.2.1.bb =
scrnsaverproto_1.2.2.bb} (80%)
rename meta/recipes-graphics/xorg-proto/{xcmiscproto_1.2.1.bb =
xcmiscproto_1.2.2.bb} (73%)
rename meta/recipes-graphics/xorg-proto/{xextproto_7.2.0.bb =
xextproto_7.2.1.bb} (82%)
rename meta/recipes-graphics/xorg-proto/{xproto_7.0.22.bb = xproto_7.0.23.bb}
(72%)
--
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 04/19] kbproto: upgrade to 1.0.6
Also, shifted up one line the start and end lines for licence checksum
computation.
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../{kbproto_1.0.5.bb = kbproto_1.0.6.bb} |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-proto/{kbproto_1.0.5.bb = kbproto_1.0.6.bb}
(68%)
diff --git a/meta/recipes-graphics/xorg-proto/kbproto_1.0.5.bb
b/meta/recipes-graphics/xorg-proto/kbproto_1.0.6.bb
similarity index 68%
rename from meta/recipes-graphics/xorg-proto/kbproto_1.0.5.bb
rename to meta/recipes-graphics/xorg-proto/kbproto_1.0.6.bb
index f1f7cbb..9177903 100644
--- a/meta/recipes-graphics/xorg-proto/kbproto_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-proto/kbproto_1.0.6.bb
@@ -8,12 +8,12 @@ to keyboard handling and layout.
LICENSE = MIT-style
LIC_FILES_CHKSUM = file://COPYING;md5=7dd6ea99e2a83a552c02c80963623c38 \
-
file://XKBproto.h;beginline=2;endline=26;md5=5744eeff407aeb6e7a1346eebab486a2
+
file://XKBproto.h;beginline=1;endline=25;md5=5744eeff407aeb6e7a1346eebab486a2
PR = r0
PE = 1
BBCLASSEXTEND = native nativesdk
-SRC_URI[md5sum] = e7edb59a3f54af15f749e8f3e314ee62
-SRC_URI[sha256sum] =
0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
+SRC_URI[md5sum] = 677ea8523eec6caca86121ad2dca0b71
+SRC_URI[sha256sum] =
037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479
--
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 02/19] libdrm: upgrade to 2.4.34
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../drm/{libdrm_2.4.31.bb = libdrm_2.4.34.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/drm/{libdrm_2.4.31.bb = libdrm_2.4.34.bb} (62%)
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.31.bb
b/meta/recipes-graphics/drm/libdrm_2.4.34.bb
similarity index 62%
rename from meta/recipes-graphics/drm/libdrm_2.4.31.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.34.bb
index 6aa0542..bf489cf 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.31.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.34.bb
@@ -8,5 +8,5 @@ SRC_URI += file://installtests.patch \
file://GNU_SOURCE_definition.patch \
-SRC_URI[md5sum] = b8cf744ec113c6028fe0975b1133b649
-SRC_URI[sha256sum] =
8fc7e0e5b2f9bf493447a4ef7adc49174a700824457774cb53c1b8f2da866af4
+SRC_URI[md5sum] = 293cb2b31392d52caa02ab0861dfc2c9
+SRC_URI[sha256sum] =
a468570e7c85107b7c2f8eaceeebaa8f8a0da86482618f445bb74fa0b0d0f8d0
--
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 05/19] fontsproto: upgrade to 2.1.2
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../{fontsproto_2.1.1.bb = fontsproto_2.1.2.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{fontsproto_2.1.1.bb =
fontsproto_2.1.2.bb} (77%)
diff --git a/meta/recipes-graphics/xorg-proto/fontsproto_2.1.1.bb
b/meta/recipes-graphics/xorg-proto/fontsproto_2.1.2.bb
similarity index 77%
rename from meta/recipes-graphics/xorg-proto/fontsproto_2.1.1.bb
rename to meta/recipes-graphics/xorg-proto/fontsproto_2.1.2.bb
index af59240..d87786e 100644
--- a/meta/recipes-graphics/xorg-proto/fontsproto_2.1.1.bb
+++ b/meta/recipes-graphics/xorg-proto/fontsproto_2.1.2.bb
@@ -15,5 +15,5 @@ PE = 1
BBCLASSEXTEND = native
-SRC_URI[md5sum] = 37102ffcaa73f77d700acd6f7a25d8f0
-SRC_URI[sha256sum] =
9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc
+SRC_URI[md5sum] = c5f4f1fb4ba7766eedbc9489e81f3be2
+SRC_URI[sha256sum] =
869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9
--
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 06/19] xextproto: upgrade to 7.2.1
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../{xextproto_7.2.0.bb = xextproto_7.2.1.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{xextproto_7.2.0.bb =
xextproto_7.2.1.bb} (82%)
diff --git a/meta/recipes-graphics/xorg-proto/xextproto_7.2.0.bb
b/meta/recipes-graphics/xorg-proto/xextproto_7.2.1.bb
similarity index 82%
rename from meta/recipes-graphics/xorg-proto/xextproto_7.2.0.bb
rename to meta/recipes-graphics/xorg-proto/xextproto_7.2.1.bb
index 09eb59a..69e4d0d 100644
--- a/meta/recipes-graphics/xorg-proto/xextproto_7.2.0.bb
+++ b/meta/recipes-graphics/xorg-proto/xextproto_7.2.1.bb
@@ -21,5 +21,5 @@ EXTRA_OECONF_append = --enable-specs=no
BBCLASSEXTEND = native nativesdk
-SRC_URI[md5sum] = 220732210ceffb01bf1caf970e3b1bfb
-SRC_URI[sha256sum] =
d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5
+SRC_URI[md5sum] = eaac343af094e6b608cf15cfba0f77c5
+SRC_URI[sha256sum] =
7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a
--
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 07/19] xcmiscproto: upgrade to 1.2.2
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../{xcmiscproto_1.2.1.bb = xcmiscproto_1.2.2.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{xcmiscproto_1.2.1.bb =
xcmiscproto_1.2.2.bb} (73%)
diff --git a/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.1.bb
b/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb
similarity index 73%
rename from meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.1.bb
rename to meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb
index af5ddfd..b5c085c 100644
--- a/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.1.bb
+++ b/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb
@@ -14,5 +14,5 @@ PE = 1
BBCLASSEXTEND = native nativesdk
-SRC_URI[md5sum] = cd7372cd827bfd7ca7e9238f2ce274b1
-SRC_URI[sha256sum] =
730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15
+SRC_URI[md5sum] = 5f4847c78e41b801982c8a5e06365b24
+SRC_URI[sha256sum] =
b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df
--
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 08/19] scrnsaverproto: upgrade to 1.2.2
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
...saverproto_1.2.1.bb = scrnsaverproto_1.2.2.bb} |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-proto/{scrnsaverproto_1.2.1.bb =
scrnsaverproto_1.2.2.bb} (80%)
diff --git a/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.1.bb
b/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb
similarity index 80%
rename from meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.1.bb
rename to meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb
index fe937eb..3045ccf 100644
--- a/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.1.bb
+++ b/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb
@@ -16,6 +16,5 @@ PE = 1
EXTRA_OECONF_append = --enable-specs=no
-SRC_URI[md5sum] = 6af0f2e3369f5f74e69345e214f5fd0d
-SRC_URI[sha256sum] =
fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1
-
+SRC_URI[md5sum] = edd8a73775e8ece1d69515dd17767bfb
+SRC_URI[sha256sum] =
8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65
--
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 09/19] recordproto: upgrade to 1.14.2
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
...recordproto_1.14.1.bb = recordproto_1.14.2.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{recordproto_1.14.1.bb =
recordproto_1.14.2.bb} (76%)
diff --git a/meta/recipes-graphics/xorg-proto/recordproto_1.14.1.bb
b/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
similarity index 76%
rename from meta/recipes-graphics/xorg-proto/recordproto_1.14.1.bb
rename to meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
index 8ee2017..24404a7 100644
--- a/meta/recipes-graphics/xorg-proto/recordproto_1.14.1.bb
+++ b/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
@@ -14,5 +14,5 @@ CONFLICTS = recordext
PR = r0
PE = 1
-SRC_URI[md5sum] = 24541a30b399213def35f48efd926c63
-SRC_URI[sha256sum] =
b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d
+SRC_URI[md5sum] = 1b4e5dede5ea51906f1530ca1e21d216
+SRC_URI[sha256sum] =
a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370
--
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 11/19] libxt: upgrade to 1.1.3
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../xorg-lib/{libxt_1.1.2.bb = libxt_1.1.3.bb}|4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxt_1.1.2.bb = libxt_1.1.3.bb} (91%)
diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.1.2.bb
b/meta/recipes-graphics/xorg-lib/libxt_1.1.3.bb
similarity index 91%
rename from meta/recipes-graphics/xorg-lib/libxt_1.1.2.bb
rename to meta/recipes-graphics/xorg-lib/libxt_1.1.3.bb
index 04fd59d..8249e78 100644
--- a/meta/recipes-graphics/xorg-lib/libxt_1.1.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxt_1.1.3.bb
@@ -41,5 +41,5 @@ do_compile() {
oe_runmake
}
-SRC_URI[md5sum] = c4f7f149559320f378d93b835d38ad6f
-SRC_URI[sha256sum] =
f041a7802b13630348072f5a609e0cc0e3df2382c0ddaae41d2769422eacc347
+SRC_URI[md5sum] = a6f137ae100e74ebe3b71eb4a38c40b3
+SRC_URI[sha256sum] =
8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd
--
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 10/19] xcb-proto: upgrade to 1.7.1
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../xcb/{xcb-proto_1.7.bb = xcb-proto_1.7.1.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xcb/{xcb-proto_1.7.bb = xcb-proto_1.7.1.bb} (61%)
diff --git a/meta/recipes-graphics/xcb/xcb-proto_1.7.bb
b/meta/recipes-graphics/xcb/xcb-proto_1.7.1.bb
similarity index 61%
rename from meta/recipes-graphics/xcb/xcb-proto_1.7.bb
rename to meta/recipes-graphics/xcb/xcb-proto_1.7.1.bb
index fac24df..27050d2 100644
--- a/meta/recipes-graphics/xcb/xcb-proto_1.7.bb
+++ b/meta/recipes-graphics/xcb/xcb-proto_1.7.1.bb
@@ -6,5 +6,5 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
PR = r0
-SRC_URI[md5sum] = f5d73ec841ed055f5e80535819f18400
-SRC_URI[sha256sum] =
e67eb7263f222133fb9d1de70928724bea3a448cdcd99d0fa4c63c04fc124b38
+SRC_URI[md5sum] = 948fec39dd42f3694edd5d9689735ec4
+SRC_URI[sha256sum] =
ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437
--
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 12/19] xtrans: upgrade to 1.2.7
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../xorg-lib/{xtrans_1.2.6.bb = xtrans_1.2.7.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{xtrans_1.2.6.bb = xtrans_1.2.7.bb}
(82%)
diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.2.6.bb
b/meta/recipes-graphics/xorg-lib/xtrans_1.2.7.bb
similarity index 82%
rename from meta/recipes-graphics/xorg-lib/xtrans_1.2.6.bb
rename to meta/recipes-graphics/xorg-lib/xtrans_1.2.7.bb
index 19abe5a..5aaf501 100644
--- a/meta/recipes-graphics/xorg-lib/xtrans_1.2.6.bb
+++ b/meta/recipes-graphics/xorg-lib/xtrans_1.2.7.bb
@@ -21,5 +21,5 @@ inherit gettext
BBCLASSEXTEND = native nativesdk
-SRC_URI[md5sum] = c66f9ffd2da4fb012220c6c40ebc7609
-SRC_URI[sha256sum] =
c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6
+SRC_URI[md5sum] = 84c66908cf003ad8c272b0eecbdbaee3
+SRC_URI[sha256sum] =
7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
--
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 13/19] fontconfig: upgrade to 2.9.0
Other changes:
- licence checksums because the licence headers changed slightly
- rebased the fix-pkgconfig.patch to apply on 2.9.0
- removed all sed instructions in do_configure_append() that were
changing fc-arch/Makefile. In the new version the fc-arch/ directory
has been removed in order to make the package cross-compiling safe
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../97_fontconfig |0
.../fix-pkgconfig.patch|4 ++--
...-native_2.8.0.bb = fontconfig-native_2.9.0.bb} |0
.../{fontconfig_2.8.0.bb = fontconfig_2.9.0.bb} | 12
4 files changed, 6 insertions(+), 10 deletions(-)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.8.0 =
fontconfig-2.9.0}/97_fontconfig (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.8.0 =
fontconfig-2.9.0}/fix-pkgconfig.patch (84%)
rename meta/recipes-graphics/fontconfig/{fontconfig-native_2.8.0.bb =
fontconfig-native_2.9.0.bb} (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig_2.8.0.bb =
fontconfig_2.9.0.bb} (84%)
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig
b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig
rename to meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
diff --git
a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
similarity index 84%
rename from
meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
rename to meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
index 30415fc..6be04a1 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
+++ b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
@@ -4,8 +4,8 @@ Upstream-Status: Inappropriate [configuration]
fontconfig.pc.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
fontconfig-2.8.0.orig/fontconfig.pc.in
-+++ fontconfig-2.8.0/fontconfig.pc.in
+--- fontconfig-2.9.0.orig/fontconfig.pc.in
fontconfig-2.9.0/fontconfig.pc.in
@@ -7,5 +7,5 @@
Description: Font configuration and customization library
Version: @VERSION@
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
b/meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
similarity index 84%
rename from meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
index 55c04cc..b3d5bab 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
@@ -12,15 +12,15 @@ HOMEPAGE = http://www.fontconfig.org;
BUGTRACKER = https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig;
LICENSE = MIT-style MIT PD
-LIC_FILES_CHKSUM = file://COPYING;md5=f3ad4145dea6ca7efa2f1bee8165a7a1 \
-
file://src/fcfreetype.c;endline=45;md5=bc3dd139e2f7245a02fde5545b203a6f \
-
file://src/fccache.c;beginline=1020;endline=1035;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f
+LIC_FILES_CHKSUM = file://COPYING;md5=dc5b39c592e47a22dbec44855988d2a0 \
+
file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
+
file://src/fccache.c;beginline=1077;endline=1092;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f
SECTION = libs
DEPENDS = expat freetype zlib
-PR = r4
+PR = r0
SRC_URI = http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://fix-pkgconfig.patch \
@@ -66,22 +66,18 @@ do_configure_append () {
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
- sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
- sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|'
fc-glyphname/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
- sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
[OE-core] [PATCH 14/19] libpciaccess: upgrade to 0.13.1
Removed also the fix_deletion_of_last_handle.patch because the new
version includes it.
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../fix_deletion_of_last_handle.patch | 51
...ciaccess_0.12.902.bb = libpciaccess_0.13.1.bb} |6 +--
2 files changed, 2 insertions(+), 55 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch
rename meta/recipes-graphics/xorg-lib/{libpciaccess_0.12.902.bb =
libpciaccess_0.13.1.bb} (64%)
diff --git
a/meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch
b/meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch
deleted file mode 100644
index 1933f45..000
---
a/meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Upstream-Status: Backport
-
-The below patch is from
-http://cgit.freedesktop.org/xorg/lib/libpciaccess/commit/?id=a798395a1bfd9d06d40e2d8d14377a156c94429a
-It would appear in the next .tar.bz2 release.
-
---
-
-commit a798395a1bfd9d06d40e2d8d14377a156c94429a
-Author: Daniel Drake d...@laptop.org
-Date: Fri Nov 25 12:28:48 2011 -0600
-
-delete_io_handle: fix deletion of last handle
-
-When num_ios goes from 1 to 0, a realloc(ios, 0); call is made.
-This is equivalent to free(ios) and NULL is returned.
-
-However, the previous logic in the code incorrectly discards this NULL
-return value. When we next call new_io_handle(), realloc(ios, X) is
-called with ios pointing to freed memory. This causes glibc to abort.
-
-Correct this logic to detect the 1-to-0 case and handle it correctly.
-Other cases are unchanged; there is still value in checking the
-return value from realloc() as it also returns NULL on error.
-
-Signed-off-by: Daniel Drake d...@laptop.org
-Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
-
-diff --git a/src/common_io.c b/src/common_io.c
-index f1319f8..5b35e07 100644
a/src/common_io.c
-+++ b/src/common_io.c
-@@ -64,10 +64,15 @@ delete_io_handle(struct pci_io_handle *handle)
- }
- }
-
--new = realloc(ios, sizeof(struct pci_io_handle) * (num_ios - 1));
--if (new)
--ios = new;
- num_ios--;
-+if (num_ios) {
-+new = realloc(ios, sizeof(struct pci_io_handle) * num_ios);
-+if (new)
-+ios = new;
-+} else {
-+free(ios);
-+ios = NULL;
-+}
- }
-
- _pci_hidden void
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb
b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
similarity index 64%
rename from meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb
rename to meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
index 37d291f..178e220 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
@@ -5,8 +5,6 @@ PCI bus and devices in a platform-independent way.
require xorg-lib-common.inc
-SRC_URI += file://fix_deletion_of_last_handle.patch
-
LICENSE = MIT MIT-style
LIC_FILES_CHKSUM = file://COPYING;md5=de01cb89a769dc657d4c321c209ce4fc
@@ -14,5 +12,5 @@ PR = r0
DEPENDS += xproto virtual/libx11
-SRC_URI[md5sum] = f1db198398a8a1143822acc230843e8c
-SRC_URI[sha256sum] =
0861d5bf68b598baa307e5c9b06dfd38ae03096b46e36b236106517bcd14b63a
+SRC_URI[md5sum] = 399a419ac6a54f0fc07c69c9bdf452dc
+SRC_URI[sha256sum] =
27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
--
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 15/19] xf86-input-mouse: upgrade to 1.7.2
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
...ut-mouse_1.7.1.bb = xf86-input-mouse_1.7.2.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-input-mouse_1.7.1.bb =
xf86-input-mouse_1.7.2.bb} (76%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.1.bb
b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.2.bb
similarity index 76%
rename from meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.1.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.2.bb
index e3215f9..9ff4563 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.7.2.bb
@@ -12,5 +12,5 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=237eb1d1a602d29ef2af62d8fba60f19
PR = ${INC_PR}.0
-SRC_URI[md5sum] = 13276d780b8ef3a82088f009185bf42b
-SRC_URI[sha256sum] =
d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
+SRC_URI[md5sum] = 871c828b88e9c973f1457724b35576fb
+SRC_URI[sha256sum] =
332b7357c18e6b9daba51c8ed48ce118e9b51fb5990b6a2a68637be62da7413b
--
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 17/19] xf86-video-intel: upgrade to 2.19.0
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
...-intel_2.18.0.bb = xf86-video-intel_2.19.0.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.18.0.bb =
xf86-video-intel_2.19.0.bb} (84%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.18.0.bb
b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb
similarity index 84%
rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.18.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb
index 637e11c..fe7408b 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.18.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb
@@ -22,5 +22,5 @@ EXTRA_OECONF += '${@base_conditional( ROOTLESS_X, 1,
--enable-kms-only,
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-SRC_URI[md5sum] = 34f3987ffe86e30c57abc33b7f8030e9
-SRC_URI[sha256sum] =
dce63e33ccfada39ef1e1e6768dfd8edd4c525670dfe56d1c42b2f9570039ffc
+SRC_URI[md5sum] = f397bddfc88d4c9b30b56526c1e02e8e
+SRC_URI[sha256sum] =
32133d61b14ce3b45b83a60e4ed8eb75159259d708f056144250aaeabf16e4bc
--
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 18/19] xf86-input-synaptics: upgrade to 1.6.1
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
...tics_1.5.0.bb = xf86-input-synaptics_1.6.1.bb} |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.5.0.bb =
xf86-input-synaptics_1.6.1.bb} (79%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.5.0.bb
b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.6.1.bb
similarity index 79%
rename from meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.5.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.6.1.bb
index 5e46567..8f2a7f2 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.6.1.bb
@@ -12,10 +12,10 @@ advanced features of the touchpad to become available.
LIC_FILES_CHKSUM = file://COPYING;md5=e395e21f3c21d4fc3a243783e85e9ab5
-PR = ${INC_PR}.2
+PR = ${INC_PR}.0
-SRC_URI[md5sum] = 41ee749ecbfef98f7fba708cb2afae87
-SRC_URI[sha256sum] =
95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e
+SRC_URI[md5sum] = d10a7ee362d015975fbef11c6beaac97
+SRC_URI[sha256sum] =
1ab1459ea340f371c40be7d6a780e43bdaa2d9799c1de21145e3b5808d0eab3c
DEPENDS += libxi
--
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 16/19] xf86-video-vesa: upgrade to 2.3.1
Also, licence checksum has changed because a new copyright line from
Red Hat has been added. The rest of licence file, however, is unchanged.
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
...ideo-vesa_2.3.0.bb = xf86-video-vesa_2.3.1.bb} |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-video-vesa_2.3.0.bb =
xf86-video-vesa_2.3.1.bb} (74%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.1.bb
similarity index 74%
rename from meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.1.bb
index f0c0167..bc7fb2e 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.1.bb
@@ -1,6 +1,6 @@
require xorg-driver-video.inc
-LIC_FILES_CHKSUM = file://COPYING;md5=e5418e7a75e21268637984e70265e146
+LIC_FILES_CHKSUM = file://COPYING;md5=a1f0610ebdc6f314a9fa5102a8c5c1b0
EXTRA_OECONF += --disable-xvmc
@@ -20,5 +20,5 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
RRECOMMENDS_${PN} += xserver-xorg-module-libint10
-SRC_URI[md5sum] = 07fa32958aff9b463dd3af5481ef6626
-SRC_URI[sha256sum] =
8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
+SRC_URI[md5sum] = 02e6eacc2d1e07ac893b62481905d6f0
+SRC_URI[sha256sum] =
e4a1038d5bc8884de461737f68f963651ef91137976388e1db4efc3991d01573
--
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 19/19] Update to distro_tracking_fields.inc
The fields for the following packages were updated: libdrm xf86-video-vmware xf86-input-mouse xf86-video-vesa xf86-video-intel xf86-input-synaptics mdadm xextproto xcmiscproto scrnsaverproto recordproto xproto kbproto fontsproto libxt xtrans libpciaccess fontconfig xcb-proto Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 180 ++-- 1 file changed, 89 insertions(+), 91 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index 8b8eeaa..5afe38f 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -1071,15 +1071,15 @@ RECIPE_MAINTAINER_pn-quota = Dongxiao Xu dongxiao...@intel.com RECIPE_STATUS_pn-mdadm = green RECIPE_DEPENDENCY_CHECK_pn-mdadm = not done -RECIPE_LATEST_VERSION_pn-mdadm = 3.2.3 +RECIPE_LATEST_VERSION_pn-mdadm = 3.2.5 RECIPE_NO_OF_PATCHES_pn-mdadm = 1 RECIPE_PATCH_pn-mdadm+mdadm-3.2.2_fix_for_x32 = fix CC's value RECIPE_INTEL_SECTION_pn-mdadm = base utils -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mdadm = 4+ months -RECIPE_LATEST_RELEASE_DATE_pn-mdadm = Dec 23, 2011 +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mdadm = 10 days +RECIPE_LATEST_RELEASE_DATE_pn-mdadm = May 18, 2012 RECIPE_COMMENTS_pn-mdadm = -RECIPE_LAST_UPDATE_pn-mdadm = Dec 30, 2011 -RECIPE_MAINTAINER_pn-mdadm = Dexuan Cui dexuan@intel.com +RECIPE_LAST_UPDATE_pn-mdadm = May 22, 2012 +RECIPE_MAINTAINER_pn-mdadm = Laurentiu Palcu laurentiu.pa...@intel.com RECIPE_STATUS_pn-screen = green RECIPE_DEPENDENCY_CHECK_pn-screen = not done @@ -3814,15 +3814,14 @@ RECIPE_LAST_UPDATE_pn-xf86-input-keyboard = Feb 02, 2012 RECIPE_MAINTAINER_pn-xf86-input-keyboard=Saul Wold s...@linux.intel.com RECIPE_STATUS_pn-xf86-input-mouse=green -# no update needed DISTRO_PN_ALIAS_pn-xf86-input-mouse = Ubuntu=xserver-xorg-input-mouse Mandriva=x11-driver-input-mouse Debian=xserver-xorg-input-mouse -RECIPE_LATEST_VERSION_pn-xf86-input-mouse=1.7.1 -RECIPE_LATEST_RELEASE_DATE_pn-xf86-input-mouse=Jul 05, 2011 -RECIPE_LAST_UPDATE_pn-xf86-input-mouse = Nov 28, 2011 +RECIPE_LATEST_VERSION_pn-xf86-input-mouse=1.7.2 +RECIPE_LATEST_RELEASE_DATE_pn-xf86-input-mouse=Mar 03, 2012 +RECIPE_LAST_UPDATE_pn-xf86-input-mouse = May 23, 2012 RECIPE_NO_OF_PATCHES_pn-xf86-input-mouse=0 -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xf86-input-mouse=9 monthes +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xf86-input-mouse=8 months RECIPE_INTEL_SECTION_pn-xf86-input-mouse=graphic core -RECIPE_MAINTAINER_pn-xf86-input-mouse=Saul Wold s...@linux.intel.com +RECIPE_MAINTAINER_pn-xf86-input-mouse=Laurentiu Palcu laurentiu.pa...@intel.com RECIPE_STATUS_pn-xf86-input-vmmouse=green # update needed @@ -3836,14 +3835,13 @@ RECIPE_LAST_UPDATE_pn-xf86-input-vmmouse = Nov 12, 2010 RECIPE_MAINTAINER_pn-xf86-input-vmmouse=Saul Wold s...@linux.intel.com RECIPE_STATUS_pn-libdrm=green -# no update needed -RECIPE_LATEST_VERSION_pn-libdrm = 2.4.31 -RECIPE_LATEST_RELEASE_DATE_pn-libdrm = Feb 06, 2012 -RECIPE_LAST_UPDATE_pn-libdrm = Feb 27, 2012 -RECIPE_NO_OF_PATCHES_pn-libdrm=1 -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libdrm=1 month +RECIPE_LATEST_VERSION_pn-libdrm = 2.4.34 +RECIPE_LATEST_RELEASE_DATE_pn-libdrm = May 10, 2012 +RECIPE_LAST_UPDATE_pn-libdrm = May 21, 2012 +RECIPE_NO_OF_PATCHES_pn-libdrm=2 +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libdrm=3 months RECIPE_INTEL_SECTION_pn-libdrm=graphic core -RECIPE_MAINTAINER_pn-libdrm=Saul Wold s...@linux.intel.com +RECIPE_MAINTAINER_pn-libdrm=Laurentiu Palcu laurentiu.pa...@intel.com RECIPE_STATUS_pn-python-pycairo=green # no upgrade needed @@ -3879,25 +3877,23 @@ RECIPE_LAST_UPDATE_pn-xf86-input-evdev = Jan 18, 2011 RECIPE_MAINTAINER_pn-xf86-input-evdev=Saul Wold s...@linux.intel.com RECIPE_STATUS_pn-xf86-video-vmware=green -# no update needed DISTRO_PN_ALIAS_pn-xf86-video-vmware = Debian=xserver-xorg-video-vmware Fedora=xorg-x11-drv-vmware Mandriva=x11-driver-video-vmware Ubuntu=xserver-xorg-video-vmware -RECIPE_LATEST_VERSION_pn-xf86-video-vmware=11.0.3 +RECIPE_LATEST_VERSION_pn-xf86-video-vmware=12.0.2 RECIPE_NO_OF_PATCHES_pn-xf86-video-vmware=0 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xf86-video-vmware=2 months -RECIPE_LATEST_RELEASE_DATE_pn-xf86-video-vmware=Nov 09, 2010 +RECIPE_LATEST_RELEASE_DATE_pn-xf86-video-vmware=Mar 21, 2012 RECIPE_INTEL_SECTION_pn-xf86-video-vmware=graphic core -RECIPE_LAST_UPDATE_pn-xf86-video-vmware = Nov 12, 2010 -RECIPE_MAINTAINER_pn-xf86-video-vmware=Saul Wold s...@linux.intel.com +RECIPE_LAST_UPDATE_pn-xf86-video-vmware = May 16, 2012 +RECIPE_MAINTAINER_pn-xf86-video-vmware=Laurentiu Palcu laurentiu.pa...@intel.com RECIPE_STATUS_pn-xf86-video-vesa = green -# no update needed -RECIPE_LATEST_VERSION_pn-xf86-video-vesa = 2.3.0 +RECIPE_LATEST_VERSION_pn-xf86-video-vesa = 2.3.1 RECIPE_NO_OF_PATCHES_pn-xf86-video-vesa = 0
[OE-core] [PATCH] xf86-video-intel: recipe upgrade from 2.18 to 2.19
Signed-off-by: mihai lindner mihaix.lind...@linux.intel.com
---
.../{xf86-video-intel_2.18.0.bb = xf86-video-intel_2.19.0.bb} |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.18.0.bb =
xf86-video-intel_2.19.0.bb} (82%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.18.0.bb
b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb
similarity index 82%
rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.18.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb
index 637e11c..e9e43ff 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.18.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.19.0.bb
@@ -9,7 +9,7 @@ Infrastructure (DRI).
LIC_FILES_CHKSUM = file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e
-PR = ${INC_PR}.0
+PR = ${INC_PR}.1
DEPENDS += virtual/libx11 libxvmc drm xf86driproto glproto \
virtual/libgl xineramaproto xf86driproto libpciaccess
@@ -22,5 +22,5 @@ EXTRA_OECONF += '${@base_conditional( ROOTLESS_X, 1,
--enable-kms-only,
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-SRC_URI[md5sum] = 34f3987ffe86e30c57abc33b7f8030e9
-SRC_URI[sha256sum] =
dce63e33ccfada39ef1e1e6768dfd8edd4c525670dfe56d1c42b2f9570039ffc
+SRC_URI[md5sum] = f397bddfc88d4c9b30b56526c1e02e8e
+SRC_URI[sha256sum] =
32133d61b14ce3b45b83a60e4ed8eb75159259d708f056144250aaeabf16e4bc
-- 1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] sudo: fixed wrong `chmod` path
Placed $D between braces ${D} to be correctly expanded to the
workdir path, instead of a path relative to host rootfs.
Currently, bitbake sudo fails on host systems where sudo is not
installed.
Signed-off-by: Mihai Lindner mihaix.lind...@linux.intel.com
---
meta/recipes-extended/sudo/sudo_1.8.4p4.bb |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/sudo/sudo_1.8.4p4.bb
b/meta/recipes-extended/sudo/sudo_1.8.4p4.bb
index 2315322..20c4a14 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.4p4.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.4p4.bb
@@ -1,6 +1,6 @@
require sudo.inc
-PR = r0
+PR = r1
SRC_URI = http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
file://libtool.patch \
@@ -24,6 +24,6 @@ do_install_append () {
fi
done
- chmod 4111 $D/usr/bin/sudo
- chmod 0440 $D/etc/sudoers
+ chmod 4111 ${D}/usr/bin/sudo
+ chmod 0440 ${D}/etc/sudoers
}
-- 1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] valgrind: Enable valgrind for armv7
2012/5/23 Samuel Stirtzel s.stirt...@googlemail.com:
2012/5/23 Koen Kooi k...@dominion.thruhere.net:
Op 23 mei 2012, om 14:46 heeft Samuel Stirtzel het volgende geschreven:
Valgrind supports the armv7 architecture, this patch allows armv7 users to
build and use Valgrind
This patch was run-tested on a Gumstix Overo (armv7a cortex-a8)
* The test consisted of running valgrinds memcheck (memory leakage
detection),
* and callgrind (profiling) on a Qt 4 application
Signed-off-by: Samuel Stirtzel s.stirt...@googlemail.com
---
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index d7c7b24..0998f72 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -23,13 +23,16 @@ SRC_URI[md5sum] = a855fda56edf05614f099dca316d1775
SRC_URI[sha256sum] =
5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
+COMPATIBLE_HOST_armv7a = 'arm.*-linux'
inherit autotools
EXTRA_OECONF = --enable-tls
+EXTRA_OECONF_armv7a = --enable-tls -host=armv7-none-linux-gnueabi
we should already be passing --host through autotools.bbclass. Does the
configure have a special check? I've seen a few projects that insist on the
-none- TARGET_VENDOR for no good reason :(
At some extend yes, the configuration checks the host, the default
string passed is arm but the configure.in checks for:
case ${host_cpu} in
...
armv7*)
AC_MSG_RESULT([ok (${host_cpu})])
ARCH_MAX=arm
So if we use the default from autotools it won't work.
I've seen the arch in some examples on the net, do you prefer -host=armv7?
Seems to be a more intelligent check:
checking host system type... Invalid configuration `armv7': machine
`armv7' not recognized
EXTRA_OEMAKE = -w
PARALLEL_MAKE =
FILES_${PN}-dbg += ${libdir}/${PN}/*/.debug/*
RRECOMMENDS_${PN}_powerpc += ${TCLIBC}-dbg
RRECOMMENDS_${PN}_powerpc64 += ${TCLIBC}-dbg
+RRECOMMENDS_${PN}_armv7a += libc6-dbg
${TCLIBC}-dbg ?
v3 coming soon, it looked odd because of angstrom.inc: ${TCLIBC} ?= eglibc,
but it seems alright with ${TCLIBC}-dbg pointing to libc6-dbg
--
Regards
Samuel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] valgrind: Enable valgrind for armv7
Valgrind supports the armv7 architecture, this patch allows armv7 users to
build and use Valgrind
This patch was run-tested on a Gumstix Overo (armv7a cortex-a8)
* The test consisted of running valgrinds memcheck (memory leakage detection),
* and callgrind (profiling) on a Qt 4 application
Signed-off-by: Samuel Stirtzel s.stirt...@googlemail.com
---
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index d7c7b24..6b54472 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -23,13 +23,16 @@ SRC_URI[md5sum] = a855fda56edf05614f099dca316d1775
SRC_URI[sha256sum] =
5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
+COMPATIBLE_HOST_armv7a = 'arm.*-linux'
inherit autotools
EXTRA_OECONF = --enable-tls
+EXTRA_OECONF_armv7a = --enable-tls -host=armv7-none-linux-gnueabi
EXTRA_OEMAKE = -w
PARALLEL_MAKE =
FILES_${PN}-dbg += ${libdir}/${PN}/*/.debug/*
RRECOMMENDS_${PN}_powerpc += ${TCLIBC}-dbg
RRECOMMENDS_${PN}_powerpc64 += ${TCLIBC}-dbg
+RRECOMMENDS_${PN}_armv7a += ${TCLIBC}-dbg
--
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] [PATCH 1/9] tar: fix build
On Wed, 2012-05-23 at 04:44 -0600, Gary Thomas wrote:
On 2012-05-22 18:05, nitin.a.kam...@intel.com wrote:
From: Nitin A Kamblenitin.a.kam...@intel.com
Avoid this error:
| rmdir: failed to remove
`/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/tar-1.26-r1/image/usr/sbin/':
No such file or directory
NOTE: package tar-1.26-r1: task do_install: Failed
no PR bump as no change in the output.
Signed-off-by: Nitin A Kamblenitin.a.kam...@intel.com
---
meta/recipes-extended/tar/tar.inc |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/tar/tar.inc
b/meta/recipes-extended/tar/tar.inc
index 0533b82..5c2325a 100644
--- a/meta/recipes-extended/tar/tar.inc
+++ b/meta/recipes-extended/tar/tar.inc
@@ -18,8 +18,12 @@ do_install () {
do_install_extra () {
install -d ${D}${base_bindir}
mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
-rmdir ${D}${bindir}/
-rmdir ${D}${sbindir}/
+if [ -d ${D}${bindir}/ ] ; then
+rmdir ${D}${bindir}/
+fi
+if [ -d ${D}${sbindir}/ ] ; then
+rmdir ${D}${sbindir}/
+fi
mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
}
Why not just use
rm -fr ${D}${bindir}
etc? No need for all the extra testing...
I've mentioned this once before however I'll do so again. I think these
empty directories were a bug in automake. It looks like automake has
fixed that problem and no longer generates them. I think the correct
thing to do is simply remove the rmdir.
The reason we used rmdir instead of rm is we wanted to know if these
suddenly started containing files, not silently delete them.
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] dropbear: fix include dependent PR generation
On 05/23/2012 12:12 AM, Steffen Sledz wrote:
On 22.05.2012 16:16, Steffen Sledz wrote:
Signed-off-by: Steffen Sledzsl...@dresearch-fe.de
---
meta/recipes-core/dropbear/dropbear.inc|2 ++
meta/recipes-core/dropbear/dropbear_2012.55.bb |2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/dropbear/dropbear.inc
b/meta/recipes-core/dropbear/dropbear.inc
index 2d6aeb2..2de442c 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -2,6 +2,8 @@ DESCRIPTION = Dropbear is a lightweight SSH and SCP
implementation
HOMEPAGE = http://matt.ucc.asn.au/dropbear/dropbear.html;
SECTION = console/network
+INC_PR = r0
+
# some files are from other projects and have others license terms:
# public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY
LICENSE = MIT
diff --git a/meta/recipes-core/dropbear/dropbear_2012.55.bb
b/meta/recipes-core/dropbear/dropbear_2012.55.bb
index 4f0ef80..8323a33 100644
--- a/meta/recipes-core/dropbear/dropbear_2012.55.bb
+++ b/meta/recipes-core/dropbear/dropbear_2012.55.bb
@@ -3,4 +3,4 @@ require dropbear.inc
SRC_URI[md5sum] = 44836e5a0419ba12557f9ea46880077e
SRC_URI[sha256sum] =
808df243c61bb60f2f18fa64bca628cbba0918b2a14139f10e6d59d4ac5a17ce
-PR = r0
+PR = ${INC_PR}.0
Did this message made it to the ML?
I guess not, please resend as a proper patch.
Thanks
Sau!
I could not find it in Patchwork OpenEmbedded Core?. :(
Steffen
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/19] Package updates
Op 23 mei 2012, om 15:10 heeft Laurentiu Palcu het volgende geschreven: The updates in this patchset are mainly related to graphics functionality area. How were those tested? The following changes since commit 33c4bf2096effc850720009564e3d1adbda24452: fetch2: Also exclude urls containing wildcards from checksumming for now (2012-05-22 12:18:53 +0100) That commit doesn't exist in oe-core are available in the git repository at: git://git.yoctoproject.org/poky-contrib lpalcu/updates http://git.yoctoproject.org/cgit.cgi//log/?h=lpalcu/updates And that branch fails to merge into oe-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] V2 rpm 5.4.0: respect to the arch when choose the alternatives
Changes of V2: Fix the rpm rather than the PACKAGE_EXTRA_ARCHS // Robert The following changes since commit 3bf8069100e54153d13319dc32ca089327b6a139: documentation/yocto-project-qs/yocto-project-qs.xml: added quotes (2012-05-01 21:00:36 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/121_rpm_arch http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/121_rpm_arch Robert Yang (1): rpm 5.4.0: respect to the arch when choose the alternatives .../rpm/rpm/rpm-respect-arch.patch | 67 meta/recipes-devtools/rpm/rpm_5.4.0.bb |3 +- 2 files changed, 69 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] rpm 5.4.0: respect to the arch when choose the alternatives
There is a bug if we:
1) bitbake diffutils with MACHINE=crownbay
2) bitbake diffutils with MACHINE=qemux86
3) bitbake core-image-sato with MACHINE=crownbay
Then the diffutils.i586 would be installed to the crownbay's image, this
is because diffutils.i586 is newer than diffutils.core2, and rpm doesn't
respect to the arch priorities:
We have put the archs in order in _solve_dbpath:
crownbay/solvedb:core2/solvedb:i586/solvedb:all/solvedb
Fix rpm to respect to the order, for example, if it finds a pkg in both
core2/ and i586/, and the core2/ comes first, it should not use the one
in i586/ even if it's build time is newer.
Note: Don't worry about the _free(*ptr), it can check whether ptr is
NULL or not.
This is for the denzil branch, and the master branch also needs it.
[YOCTO #2360]
Signed-off-by: Robert Yang liezhi.y...@windriver.com
---
.../rpm/rpm/rpm-respect-arch.patch | 67
meta/recipes-devtools/rpm/rpm_5.4.0.bb |3 +-
2 files changed, 69 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
b/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
new file mode 100644
index 000..9b63b37
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
@@ -0,0 +1,67 @@
+rpmts.c: respect to the arch priorities
+
+Let rpm respect to the priorities when choose alternatives rpm, the arch
+which comes first is preferred.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang liezhi.y...@windriver.com
+---
+ lib/rpmts.c | 14 ++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/lib/rpmts.c b/lib/rpmts.c
+index 3fbbc9e..40ec08e 100644
+--- a/lib/rpmts.c
b/lib/rpmts.c
+@@ -353,6 +353,7 @@ int rpmtsSolve(rpmts ts, rpmds ds, /*@unused@*/ const void
* data)
+ Header h = NULL;
+ size_t bhnamelen = 0;
+ time_t bhtime = 0;
++const char *bharch = NULL;
+ rpmTag rpmtag;
+ const char * keyp;
+ size_t keylen = 0;
+@@ -409,6 +410,7 @@ fprintf(stderr, -- %s(%p,%p,%p)\n, __FUNCTION__, ts,
ds, data);
+ while ((h = rpmmiNext(mi)) != NULL) {
+ size_t hnamelen;
+ time_t htime;
++ const char *harch = NULL;
+
+ if (rpmtag == RPMTAG_PROVIDENAME !rpmdsAnyMatchesDep(h, ds, 1))
+ continue;
+@@ -431,12 +433,23 @@ fprintf(stderr, -- %s(%p,%p,%p)\n, __FUNCTION__, ts,
ds, data);
+ if (htime = bhtime)
+ continue;
+
++ /* XXX Respect to the arch priorities */
++ he-tag = RPMTAG_ARCH;
++ xx = headerGet(h, he, 0);
++ harch = ((xx he-p.str) ? xstrdup(he-p.str) : NULL);
++ he-p.ptr = _free(he-p.ptr);
++ if (bharch (strcmp(bharch, harch) != 0))
++ continue;
++
+ /* Save new best candidate. */
+ (void)headerFree(bh);
+ bh = NULL;
+ bh = headerLink(h);
+ bhtime = htime;
+ bhnamelen = hnamelen;
++ bharch = _free(bharch);
++ bharch = xstrdup(harch);
++ harch = _free(harch);
+ }
+ mi = rpmmiFree(mi);
+
+@@ -449,6 +462,7 @@ fprintf(stderr, -- %s(%p,%p,%p)\n, __FUNCTION__, ts,
ds, data);
+ } while (1);
+
+ }
++bharch = _free(bharch);
+
+ /* Is there a suggested resolution? */
+ if (bh == NULL)
+--
+1.7.1
+
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 5ee6b47..d79d199 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM =
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1
DEPENDS = bzip2 zlib db openssl elfutils expat libpcre attr acl popt
${extrarpmdeps}
extrarpmdeps = python perl file
extrarpmdeps_virtclass-native = python-native file-native
-PR = r36
+PR = r37
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -70,6 +70,7 @@ SRC_URI =
http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
file://pythondeps.sh \
file://rpmdeps-oecore.patch \
file://rpm-resolvedep.patch \
+ file://rpm-respect-arch.patch \
# file://rpm-autoconf.patch \
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] curl: Update to version 7.25.0
Radu,
You should explain why you are removing a patch, I see from the Curl
archives they picked up a similar patch. I also note that this patch
slips in the following:
-+AC_SUBST(GNUTLS_REQUIRED)
Not sure if you missed that, it might still be needed.
Sau!
On 05/23/2012 01:20 AM, Radu Moisan wrote:
Signed-off-by: Radu Moisanradu.moi...@intel.com
---
meta/recipes-support/curl/curl/noldlibpath.patch | 76
.../curl/{curl_7.24.0.bb = curl_7.25.0.bb}|5 +-
2 files changed, 2 insertions(+), 79 deletions(-)
delete mode 100644 meta/recipes-support/curl/curl/noldlibpath.patch
rename meta/recipes-support/curl/{curl_7.24.0.bb = curl_7.25.0.bb} (90%)
diff --git a/meta/recipes-support/curl/curl/noldlibpath.patch
b/meta/recipes-support/curl/curl/noldlibpath.patch
deleted file mode 100644
index f4c72a1..000
--- a/meta/recipes-support/curl/curl/noldlibpath.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling.
-Since we never run compiled binaries for the target, we should *never* need
-to change LD_LIBRARY_PATH.
-
-RP 9/6/2010
-
-Index: curl-7.20.0/configure.ac
-===
curl-7.20.0.orig/configure.ac 2010-06-09 11:06:30.0 +0100
-+++ curl-7.20.0/configure.ac 2010-06-09 11:04:25.0 +0100
-@@ -1461,9 +1461,10 @@
-dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH
-dnl to prevent further configure tests to fail due to this
-
-- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_OPENSSL
-- export LD_LIBRARY_PATH
-- AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
-+ #LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB_OPENSSL
-+ #export LD_LIBRARY_PATH
-+ #AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
-+ :
- fi
- fi
-
-@@ -1684,9 +1686,10 @@
- dnl LD_LIBRARY_PATH to prevent further configure tests to fail
- dnl due to this
-
-- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$gtlslib
-- export LD_LIBRARY_PATH
-- AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
-+ #LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$gtlslib
-+ #export LD_LIBRARY_PATH
-+ #AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
-+ :
- fi
- fi
-
-@@ -1696,6 +1699,8 @@
-
- fi dnl OPENSSL != 1
-
-+AC_SUBST(GNUTLS_REQUIRED)
-+
- dnl
- dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
- dnl
-@@ -1781,9 +1786,10 @@
- dnl LD_LIBRARY_PATH to prevent further configure tests to fail
- dnl due to this
-
--LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$nssprefix/lib$libsuff
--export LD_LIBRARY_PATH
--AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
-+#LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$nssprefix/lib$libsuff
-+#export LD_LIBRARY_PATH
-+#AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
-+:
- fi
-
- fi
-@@ -1881,9 +1887,9 @@
-dnl libssh2_version is a post 1.0 addition
-AC_CHECK_FUNCS( libssh2_version )
-
-- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DIR_SSH2
-- export LD_LIBRARY_PATH
-- AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])
-+ #LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DIR_SSH2
-+ #export LD_LIBRARY_PATH
-+ #AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])
- fi
- else
- dnl no libssh2, revert back to clean variables
diff --git a/meta/recipes-support/curl/curl_7.24.0.bb
b/meta/recipes-support/curl/curl_7.25.0.bb
similarity index 90%
rename from meta/recipes-support/curl/curl_7.24.0.bb
rename to meta/recipes-support/curl/curl_7.25.0.bb
index 12e95c9..033f1bc 100644
--- a/meta/recipes-support/curl/curl_7.24.0.bb
+++ b/meta/recipes-support/curl/curl_7.25.0.bb
@@ -11,11 +11,10 @@ DEPENDS_virtclass-nativesdk = zlib-nativesdk
PR = r0
SRC_URI = http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
- file://noldlibpath.patch \
file://pkgconfig_fix.patch
-SRC_URI[md5sum] = f912221d75eb8d8fe08900eaf011b023
-SRC_URI[sha256sum] =
ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16
+SRC_URI[md5sum] = f0303d47d9d3e6e4f08c2863c6504823
+SRC_URI[sha256sum] =
cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491
inherit autotools pkgconfig binconfig
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xz: updated to version 5.1.1alpha
On 05/23/2012 04:08 AM, Valentin Popa wrote:
From: valentinvalentin@valentin-linux.(none)
The licenses are the same, only some white
spaces added/removed.
Signed-off-by: valentinvalentin.p...@intel.com
---
.../xz/{xz_5.0.3.bb = xz_5.1.1alpha.bb} | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-extended/xz/{xz_5.0.3.bb = xz_5.1.1alpha.bb} (72%)
Why update to an Alpha Version, clearly we want to wait for the
released version.
Thanks
Sau!
diff --git a/meta/recipes-extended/xz/xz_5.0.3.bb
b/meta/recipes-extended/xz/xz_5.1.1alpha.bb
similarity index 72%
rename from meta/recipes-extended/xz/xz_5.0.3.bb
rename to meta/recipes-extended/xz/xz_5.1.1alpha.bb
index e8f96b6..7fa7177 100644
--- a/meta/recipes-extended/xz/xz_5.0.3.bb
+++ b/meta/recipes-extended/xz/xz_5.1.1alpha.bb
@@ -4,17 +4,17 @@ SECTION = base
LICENSE = GPLv2+ GPLv3+ LGPLv2.1+
LIC_FILES_CHKSUM = file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
-file://COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe \
+file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504
\
-
file://COPYING.LGPLv2.1;md5=fbc093901857fcd118f065f900982c24 \
+
file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84
SRC_URI = http://tukaani.org/xz/xz-${PV}.tar.gz;
-SRC_URI[md5sum] = fefe52f9ecd521de2a8ce38c21a27574
-SRC_URI[sha256sum] =
10eb4df72dffb2fb14c3d2d82b450e72282ffcb9ee3908a8e5b392b8f09681bf
+SRC_URI[md5sum] = bb24436fa12780808e1c142980484104
+SRC_URI[sha256sum] =
54e59a83690a4a0ec88a7d7c3bdef90c6b196c892a93463863c71c24fe87951a
-PR = r1
+PR = r0
inherit autotools gettext
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 13/19] fontconfig: upgrade to 2.9.0
On 05/23/2012 06:11 AM, Laurentiu Palcu wrote:
Other changes:
- licence checksums because the licence headers changed slightly
Please be as specific as possible here, what changed slightly? Was it
the years updated or ??? We like to know.
Thanks
Sau!
- rebased the fix-pkgconfig.patch to apply on 2.9.0
- removed all sed instructions in do_configure_append() that were
changing fc-arch/Makefile. In the new version the fc-arch/ directory
has been removed in order to make the package cross-compiling safe
Signed-off-by: Laurentiu Palculaurentiu.pa...@intel.com
---
.../97_fontconfig |0
.../fix-pkgconfig.patch|4 ++--
...-native_2.8.0.bb = fontconfig-native_2.9.0.bb} |0
.../{fontconfig_2.8.0.bb = fontconfig_2.9.0.bb} | 12
4 files changed, 6 insertions(+), 10 deletions(-)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.8.0 =
fontconfig-2.9.0}/97_fontconfig (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.8.0 =
fontconfig-2.9.0}/fix-pkgconfig.patch (84%)
rename meta/recipes-graphics/fontconfig/{fontconfig-native_2.8.0.bb =
fontconfig-native_2.9.0.bb} (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig_2.8.0.bb =
fontconfig_2.9.0.bb} (84%)
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig
b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig
rename to meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
diff --git
a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
similarity index 84%
rename from
meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
rename to meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
index 30415fc..6be04a1 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
+++ b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
@@ -4,8 +4,8 @@ Upstream-Status: Inappropriate [configuration]
fontconfig.pc.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
fontconfig-2.8.0.orig/fontconfig.pc.in
-+++ fontconfig-2.8.0/fontconfig.pc.in
+--- fontconfig-2.9.0.orig/fontconfig.pc.in
fontconfig-2.9.0/fontconfig.pc.in
@@ -7,5 +7,5 @@
Description: Font configuration and customization library
Version: @VERSION@
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
b/meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
similarity index 84%
rename from meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
index 55c04cc..b3d5bab 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
@@ -12,15 +12,15 @@ HOMEPAGE = http://www.fontconfig.org;
BUGTRACKER = https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig;
LICENSE = MIT-style MIT PD
-LIC_FILES_CHKSUM = file://COPYING;md5=f3ad4145dea6ca7efa2f1bee8165a7a1 \
-
file://src/fcfreetype.c;endline=45;md5=bc3dd139e2f7245a02fde5545b203a6f \
-
file://src/fccache.c;beginline=1020;endline=1035;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f
+LIC_FILES_CHKSUM = file://COPYING;md5=dc5b39c592e47a22dbec44855988d2a0 \
+
file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
+
file://src/fccache.c;beginline=1077;endline=1092;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f
SECTION = libs
DEPENDS = expat freetype zlib
-PR = r4
+PR = r0
SRC_URI = http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://fix-pkgconfig.patch \
@@ -66,22 +66,18 @@ do_configure_append () {
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
- sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
- sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|'
fc-glyphname/Makefile
sed -i 's|CPPFLAGS
Re: [OE-core] [PATCH] xz: updated to version 5.1.1alpha
Op 23 mei 2012, om 16:14 heeft Saul Wold het volgende geschreven:
On 05/23/2012 04:08 AM, Valentin Popa wrote:
From: valentinvalentin@valentin-linux.(none)
The licenses are the same, only some white
spaces added/removed.
Signed-off-by: valentinvalentin.p...@intel.com
---
.../xz/{xz_5.0.3.bb = xz_5.1.1alpha.bb} | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-extended/xz/{xz_5.0.3.bb = xz_5.1.1alpha.bb} (72%)
Why update to an Alpha Version, clearly we want to wait for the released
version.
xz is not getting updated a lot and this release should bring parallel xz
support. I asked about this a few weeks ago here, but didn't get much response:
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-March/018706.html
regards,
Koen
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xz: updated to version 5.1.1alpha
On 05/23/2012 07:26 AM, Koen Kooi wrote:
Op 23 mei 2012, om 16:14 heeft Saul Wold het volgende geschreven:
On 05/23/2012 04:08 AM, Valentin Popa wrote:
From: valentinvalentin@valentin-linux.(none)
The licenses are the same, only some white
spaces added/removed.
Signed-off-by: valentinvalentin.p...@intel.com
---
.../xz/{xz_5.0.3.bb = xz_5.1.1alpha.bb} | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-extended/xz/{xz_5.0.3.bb = xz_5.1.1alpha.bb} (72%)
Why update to an Alpha Version, clearly we want to wait for the released
version.
xz is not getting updated a lot and this release should bring parallel xz
support. I asked about this a few weeks ago here, but didn't get much response:
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-March/018706.html
Your right about it looking pretty stable
Does anyone know Lasse Collin, to query him or their mailing list about
when the next release will happen?
Sau!
regards,
Koen
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/19] Package updates
On 05/23/2012 05:05 PM, Koen Kooi wrote: Op 23 mei 2012, om 15:10 heeft Laurentiu Palcu het volgende geschreven: The updates in this patchset are mainly related to graphics functionality area. How were those tested? Basic functionality tests on x86 only. For some reason, one could be that I'm quite new to this project :), I missed testing on other architectures... Once I fix the commit issue below and repeat my tests for mips/ppc/arm, I'll resend. The following changes since commit 33c4bf2096effc850720009564e3d1adbda24452: fetch2: Also exclude urls containing wildcards from checksumming for now (2012-05-22 12:18:53 +0100) That commit doesn't exist in oe-core It looks like I based my patches against poky/master. :( Sorry for that. I will fetch oe-core/master, rebase and resend. are available in the git repository at: git://git.yoctoproject.org/poky-contrib lpalcu/updates http://git.yoctoproject.org/cgit.cgi//log/?h=lpalcu/updates And that branch fails to merge into oe-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 13/19] fontconfig: upgrade to 2.9.0
On 05/23/2012 06:11 AM, Laurentiu Palcu wrote:
Other changes:
- licence checksums because the licence headers changed slightly
- rebased the fix-pkgconfig.patch to apply on 2.9.0
- removed all sed instructions in do_configure_append() that were
changing fc-arch/Makefile. In the new version the fc-arch/ directory
has been removed in order to make the package cross-compiling safe
Seems you missed updating the SRC_URI Checksums for this one.
Thanks
Sau!
Signed-off-by: Laurentiu Palculaurentiu.pa...@intel.com
---
.../97_fontconfig |0
.../fix-pkgconfig.patch|4 ++--
...-native_2.8.0.bb = fontconfig-native_2.9.0.bb} |0
.../{fontconfig_2.8.0.bb = fontconfig_2.9.0.bb} | 12
4 files changed, 6 insertions(+), 10 deletions(-)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.8.0 =
fontconfig-2.9.0}/97_fontconfig (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.8.0 =
fontconfig-2.9.0}/fix-pkgconfig.patch (84%)
rename meta/recipes-graphics/fontconfig/{fontconfig-native_2.8.0.bb =
fontconfig-native_2.9.0.bb} (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig_2.8.0.bb =
fontconfig_2.9.0.bb} (84%)
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig
b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig
rename to meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
diff --git
a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
similarity index 84%
rename from
meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
rename to meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
index 30415fc..6be04a1 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
+++ b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
@@ -4,8 +4,8 @@ Upstream-Status: Inappropriate [configuration]
fontconfig.pc.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
fontconfig-2.8.0.orig/fontconfig.pc.in
-+++ fontconfig-2.8.0/fontconfig.pc.in
+--- fontconfig-2.9.0.orig/fontconfig.pc.in
fontconfig-2.9.0/fontconfig.pc.in
@@ -7,5 +7,5 @@
Description: Font configuration and customization library
Version: @VERSION@
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
b/meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
similarity index 84%
rename from meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
index 55c04cc..b3d5bab 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
@@ -12,15 +12,15 @@ HOMEPAGE = http://www.fontconfig.org;
BUGTRACKER = https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig;
LICENSE = MIT-style MIT PD
-LIC_FILES_CHKSUM = file://COPYING;md5=f3ad4145dea6ca7efa2f1bee8165a7a1 \
-
file://src/fcfreetype.c;endline=45;md5=bc3dd139e2f7245a02fde5545b203a6f \
-
file://src/fccache.c;beginline=1020;endline=1035;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f
+LIC_FILES_CHKSUM = file://COPYING;md5=dc5b39c592e47a22dbec44855988d2a0 \
+
file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
+
file://src/fccache.c;beginline=1077;endline=1092;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f
SECTION = libs
DEPENDS = expat freetype zlib
-PR = r4
+PR = r0
SRC_URI = http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://fix-pkgconfig.patch \
@@ -66,22 +66,18 @@ do_configure_append () {
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
- sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
- sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|'
fc-glyphname/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
-
[OE-core] RFC: Merging commits from into the main denzil branch
Hello all, As most of you know, I've been pulling commits into a pair of sgarman/denzil-next branches which are intended to eventually become the next Denzil point-release, 1.2.1. oe-core based branch: http://git.openembedded.org/openembedded-core-contrib/log/?h=sgarman/denzil-next poky based branch: http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=sgarman/denzil-next So far I haven't merged or requested to merge any of these commits into the main denzil branches of oe-core and poky, for two main reasons: 1. I've only performed the most basic build testing of these branches on a desktop system, building core-image-minimal and core-image-sato for our 5 qemu machines. 2. To date, we haven't had a clear process on how to transition from the maintainer's personal branch into the official repo branch. I'd like to develop a clear and documented process on doing this that involves community feedback on the commits. Just this week I've been able to start using the Yocto autobuilder to do more comprehensive testing of my denzil-next branch, so issue #1 is finally resolved, and I've got a green build to raise my confidence level: http://autobuilder.yoctoproject.org:8010/builders/nightly/builds/462 So now to address issue #2. The goal is to incorporate community feedback, so I'm looking to get ACKs or NAKs for these commits before they go into the main denzil branch. My proposal is to send denzil pull requests to the appropriate mailing lists, and Richard can merge them into the main repo denzil branches once they've received review by the community. My goal is to send these pull requests about once per week, once I've managed to get a green build out of the Yocto autobuilder for my contrib branch. What do folks think about this? Now's your opportunity to offer feedback and influence this process. Thanks! Scott Yocto 1.2.1 release maintainer -- Scott Garman Embedded Linux Engineer - Yocto Project Intel Open Source Technology Center ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/9] tar: fix build
-Original Message-
From: openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
Richard Purdie
Sent: Wednesday, May 23, 2012 6:48 AM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 1/9] tar: fix build
On Wed, 2012-05-23 at 04:44 -0600, Gary Thomas wrote:
On 2012-05-22 18:05, nitin.a.kam...@intel.com wrote:
From: Nitin A Kamblenitin.a.kam...@intel.com
Avoid this error:
| rmdir: failed to remove
| `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/tar-
1
| .26-r1/image/usr/sbin/': No such file or directory
NOTE: package tar-1.26-r1: task do_install: Failed
no PR bump as no change in the output.
Signed-off-by: Nitin A Kamblenitin.a.kam...@intel.com
---
meta/recipes-extended/tar/tar.inc |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/tar/tar.inc
b/meta/recipes-extended/tar/tar.inc
index 0533b82..5c2325a 100644
--- a/meta/recipes-extended/tar/tar.inc
+++ b/meta/recipes-extended/tar/tar.inc
@@ -18,8 +18,12 @@ do_install () {
do_install_extra () {
install -d ${D}${base_bindir}
mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
-rmdir ${D}${bindir}/
-rmdir ${D}${sbindir}/
+if [ -d ${D}${bindir}/ ] ; then
+rmdir ${D}${bindir}/
+fi
+if [ -d ${D}${sbindir}/ ] ; then
+rmdir ${D}${sbindir}/
+fi
mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
}
Why not just use
rm -fr ${D}${bindir}
etc? No need for all the extra testing...
I've mentioned this once before however I'll do so again. I think these
empty directories were a bug in automake. It looks like automake has
fixed that problem and no longer generates them. I think the correct
thing to do is simply remove the rmdir.
The reason we used rmdir instead of rm is we wanted to know if these
suddenly started containing files, not silently delete them.
Cheers,
Richard
Hi Richard,
I was trying to make the commits compatible with both automake 1.11
automake 1.12. Now after discussions with Saul, I understand that these commits
will go after automake 1.12 update goes in. In that case we can remove these
rmdir statements.
Thanks,
Nitin
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 0/5] Xorg Qemu Updates
Richard, I am pulling together tested subsets that have been lingering in the queue. I have built / rebuilt these qemu updates to use xorg-xserver. I have verified that X starts on mips/ppc/x86 and they correctly report X Server 1.11.2, which is the xorg-xserver version. Sau! The following changes since commit e6333825c3482a559a0c0499e17f8f48d3042ddf: tune-mips64.inc: Add new tune file for mips64 big-endian (2012-05-20 20:24:37 -0700) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/xorg http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/xorg Khem Raj (2): qemumachines: Enable xserver-xorg as default xserver xserver-xf86-config: Add xorg.conf for arm,mips,ppc,sh qemu machines Saul Wold (2): qemu.inc: Remove mesa-xlib as PREFERRED_PROVIDER qemu: disable vnc-jpeg compression Zhai Edwin (1): qemu: Add an option to remove host sdl/gl checking meta/conf/machine/include/qemu.inc | 10 +- meta/conf/machine/qemux86-64.conf |3 +- meta/conf/machine/qemux86.conf |3 +- .../qemu/qemu-0.15.1/opengl-disable-option.patch | 172 meta/recipes-devtools/qemu/qemu.inc| 25 +--- meta/recipes-devtools/qemu/qemu_0.15.1.bb |3 +- .../xserver-xf86-config/qemuarm/xorg.conf | 69 .../xserver-xf86-config/qemumips/xorg.conf | 69 .../xserver-xf86-config/qemumips64/xorg.conf | 69 .../xserver-xf86-config/qemuppc/xorg.conf | 69 .../xserver-xf86-config/qemush4/xorg.conf | 69 .../xorg-xserver/xserver-xf86-config_0.1.bb|2 +- 12 files changed, 536 insertions(+), 27 deletions(-) create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/opengl-disable-option.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 1/5] qemumachines: Enable xserver-xorg as default xserver
From: Khem Raj raj.k...@gmail.com For qemux86 and qemux86-64 include qemu.inc after defining XSERVER XSERVER variable is also weakly defined in task-core-x11.bb which means we can not use ??= otherwise when building any qemu image that uses task-core-x11.bb will get the wrong definition So we define the XSERVER common set for qemu in qemu.inc and as we know x86 and x86-64 qemu overrides the default we include qemu.inc after that definition which means that qemux86 and qemux86-64 get their own definitions and other qemus get the definitions from qemu.inc. other non-qemu machine will get their defintion from task which points to kdrive as of now. Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/conf/machine/include/qemu.inc |9 - meta/conf/machine/qemux86-64.conf |3 ++- meta/conf/machine/qemux86.conf |3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 421a149..e384879 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -1,7 +1,14 @@ PCMCIA_MANAGER = pcmciautils -PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive +PREFERRED_PROVIDER_virtual/xserver ?= xserver-xorg PREFERRED_PROVIDER_virtual/libgl ?= mesa-xlib +XSERVER ?= xserver-xorg \ +mesa-dri-driver-swrast \ +xf86-input-evdev \ +xf86-input-mouse \ +xf86-video-fbdev \ +xf86-input-keyboard + MACHINE_FEATURES = apm alsa pcmcia bluetooth irda usbgadget screen IMAGE_FSTYPES += tar.bz2 ext3 diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 129fe9f..2e361a5 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -6,7 +6,6 @@ PREFERRED_PROVIDER_virtual/xserver ?= xserver-xorg PREFERRED_PROVIDER_virtual/libgl ?= mesa-dri require conf/machine/include/tune-x86_64.inc -require conf/machine/include/qemu.inc MACHINE_FEATURES += x86 @@ -23,6 +22,8 @@ XSERVER ?= xserver-xorg \ xf86-video-vmware \ qemugl +require conf/machine/include/qemu.inc + GLIBC_ADDONS = nptl GLIBC_EXTRA_OECONF = --with-tls diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 246d5a0..ad840c0 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -6,7 +6,6 @@ PREFERRED_PROVIDER_virtual/xserver ?= xserver-xorg PREFERRED_PROVIDER_virtual/libgl ?= mesa-dri require conf/machine/include/tune-i586.inc -require conf/machine/include/qemu.inc MACHINE_FEATURES += x86 @@ -23,6 +22,8 @@ XSERVER ?= xserver-xorg \ xf86-video-vmware \ qemugl +require conf/machine/include/qemu.inc + GLIBC_ADDONS = nptl GLIBC_EXTRA_OECONF = --with-tls -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 2/5] xserver-xf86-config: Add xorg.conf for arm, mips, ppc, sh qemu machines
From: Khem Raj raj.k...@gmail.com Signed-off-by: Khem Raj raj.k...@gmail.com --- .../xserver-xf86-config/qemuarm/xorg.conf | 69 .../xserver-xf86-config/qemumips/xorg.conf | 69 .../xserver-xf86-config/qemumips64/xorg.conf | 69 .../xserver-xf86-config/qemuppc/xorg.conf | 69 .../xserver-xf86-config/qemush4/xorg.conf | 69 .../xorg-xserver/xserver-xf86-config_0.1.bb|2 +- 6 files changed, 346 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf new file mode 100644 index 000..629ae21 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf @@ -0,0 +1,69 @@ + +Section Files +EndSection + +Section InputDevice +IdentifierGeneric Keyboard +Driverevdev +OptionCoreKeyboard +OptionDevice /dev/input/by-path/platform-i8042-serio-0-event-kbd +OptionXkbRulesxorg +OptionXkbModelevdev +OptionXkbLayoutus +EndSection + +Section InputDevice +IdentifierConfigured Mouse +Drivermouse +OptionCorePointer +OptionDevice/dev/input/mice +OptionProtocolImPS/2 +OptionZAxisMapping4 5 +OptionEmulate3Buttonstrue +EndSection + +Section InputDevice +IdentifierQemu Tablet +Driverevdev +OptionCorePointer +OptionDevice/dev/input/touchscreen0 +OptionUSB on +EndSection + +Section Device +IdentifierGraphics Controller +Driverfbdev +EndSection + +Section Monitor +IdentifierGeneric Monitor +OptionDPMS +# 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz +Modeline 1024x600_60.00 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync +# 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz +ModeLine 640x48025.2 640 656 752 800480 490 492 525 -hsync -vsync +# 640x480 @ 72Hz (VESA) hsync: 37.9kHz +ModeLine 640x48031.5 640 664 704 832480 489 491 520 -hsync -vsync +# 640x480 @ 75Hz (VESA) hsync: 37.5kHz +ModeLine 640x48031.5 640 656 720 840480 481 484 500 -hsync -vsync +# 640x480 @ 85Hz (VESA) hsync: 43.3kHz +ModeLine 640x48036.0 640 696 752 832480 481 484 509 -hsync -vsync +EndSection + +Section Screen +IdentifierDefault Screen +DeviceGraphics Controller +MonitorGeneric Monitor +SubSection Display +Modes 640x480 +EndSubSection +EndSection + +Section ServerLayout +IdentifierDefault Layout +ScreenDefault Screen +InputDeviceGeneric Keyboard +# InputDeviceConfigured Mouse +InputDeviceQEMU Tablet +Option AllowEmptyInput no +EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf new file mode 100644 index 000..629ae21 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf @@ -0,0 +1,69 @@ + +Section Files +EndSection + +Section InputDevice +IdentifierGeneric Keyboard +Driverevdev +OptionCoreKeyboard +OptionDevice /dev/input/by-path/platform-i8042-serio-0-event-kbd +OptionXkbRulesxorg +OptionXkbModelevdev +OptionXkbLayoutus +EndSection + +Section InputDevice +IdentifierConfigured Mouse +Drivermouse +OptionCorePointer +OptionDevice/dev/input/mice +OptionProtocolImPS/2 +OptionZAxisMapping4 5 +OptionEmulate3Buttonstrue +EndSection + +Section InputDevice +IdentifierQemu Tablet +Driverevdev +OptionCorePointer +OptionDevice/dev/input/touchscreen0 +OptionUSB on +EndSection + +Section Device +IdentifierGraphics Controller +Driverfbdev +EndSection + +Section Monitor +IdentifierGeneric Monitor +OptionDPMS +# 1024x600 59.85 Hz (CVT) hsync: 37.35
[OE-core] [Consolidated Pull 5/5] qemu: disable vnc-jpeg compression
This is disabled by default to ensure a deterministic build, qemu
configure would sometimes detect the libjpeg and then enable this.
Since mostly qemu is used locally disable by default.
Signed-off-by: Saul Wold s...@linux.intel.com
---
meta/recipes-devtools/qemu/qemu.inc |2 +-
meta/recipes-devtools/qemu/qemu_0.15.1.bb |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index 75ff962..e618c1d 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -12,7 +12,7 @@ SDL ?= --disable-sdl
SDL_virtclass-native ?=
SDL_virtclass-nativesdk ?=
-EXTRA_OECONF += --target-list=${@get_qemu_target_list(d)} --disable-werror
--disable-vnc-tls --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370
${SDL} --disable-curl
+EXTRA_OECONF += --target-list=${@get_qemu_target_list(d)} --disable-werror
--disable-vnc-tls --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370
${SDL} --disable-curl --disable-vnc-jpeg
#EXTRA_OECONF += --disable-sdl
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
index bdffcf4..986fa19 100644
--- a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
@@ -3,7 +3,7 @@ require qemu.inc
LIC_FILES_CHKSUM = file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913
-PR = r6
+PR = r7
FILESPATH = ${FILE_DIRNAME}/qemu-${PV}
FILESDIR = ${WORKDIR}
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 3/5] qemu.inc: Remove mesa-xlib as PREFERRED_PROVIDER
The xserver-xorg uses and depends on mesa-dri, so we should use the default PREFERRED_PROVIDER of libgl as mesa-dri. This resolves the following: ERROR: Multiple .bb files are due to be built which each provide virtual/libgl (/intel/poky/distro/meta/recipes-graphics/mesa/mesa-dri_7.11.bb /intel/poky/distro/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb). This usually means one provides something the other doesn't and should. Signed-off-by: Saul Wold s...@linux.intel.com --- meta/conf/machine/include/qemu.inc |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index e384879..5d59a7f 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -1,6 +1,5 @@ PCMCIA_MANAGER = pcmciautils PREFERRED_PROVIDER_virtual/xserver ?= xserver-xorg -PREFERRED_PROVIDER_virtual/libgl ?= mesa-xlib XSERVER ?= xserver-xorg \ mesa-dri-driver-swrast \ -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 4/5] qemu: Add an option to remove host sdl/gl checking
From: Zhai Edwin edwin.z...@intel.com
Add an PACKAGECONFIG in qemu to disable GL acceleration:
* By default configure try best to enable GL acceleration and fail when missing
host dependency(libSDL and libGL).
* End user can also choose to turn off GL capability, thus remove the host
dependence in building.
[YOCTO #2407] got fixed.
Signed-off-by: Zhai Edwin edwin.z...@intel.com
---
.../qemu/qemu-0.15.1/opengl-disable-option.patch | 172
meta/recipes-devtools/qemu/qemu.inc| 23 +---
meta/recipes-devtools/qemu/qemu_0.15.1.bb |1 +
3 files changed, 176 insertions(+), 20 deletions(-)
create mode 100644
meta/recipes-devtools/qemu/qemu-0.15.1/opengl-disable-option.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.1/opengl-disable-option.patch
b/meta/recipes-devtools/qemu/qemu-0.15.1/opengl-disable-option.patch
new file mode 100644
index 000..d0c5f23
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.15.1/opengl-disable-option.patch
@@ -0,0 +1,172 @@
+Add an option gl-accel to disable GL acceleration:
+* When enabled, configure try best to enable GL acceleration and fail when
+ missing host dependency(libSDL and libGL), which is the default.
+* When disabled, end user choose to turn off GL capability, thus remove the
+ host dependence in building.
+
+Upstream-Status: Inappropriate [other] - depends on GL patch
+
+Signed-off-by: Zhai Edwin edwin.z...@intel.com
+
+Index: qemu-0.15.1/Makefile.target
+===
+--- qemu-0.15.1.orig/Makefile.target 2012-05-14 21:23:36.0 +0800
qemu-0.15.1/Makefile.target2012-05-14 21:26:19.0 +0800
+@@ -79,15 +79,20 @@
+ libobj-y += cpuid.o
+ endif
+ libobj-$(CONFIG_NEED_MMU) += mmu.o
++
+ ifndef CONFIG_LINUX_USER
++ifdef CONFIG_GL_ACCEL
+ libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o
+ libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o
+ else
+-ifdef CONFIG_SDL
+ libobj-$(TARGET_I386) += dummygl.o
+ libobj-$(TARGET_X86_64) += dummygl.o
+-endif
++endif #CONFIG_GL_ACCEL
++else
++libobj-$(TARGET_I386) += dummygl.o
++libobj-$(TARGET_X86_64) += dummygl.o
+ endif #CONFIG_LINUX_USER
++
+ libobj-$(TARGET_ARM) += dummygl.o
+ libobj-$(TARGET_MIPS) += dummygl.o
+ libobj-$(TARGET_MIPS64) += dummygl.o
+@@ -262,8 +267,10 @@
+ obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o
+
+ ifeq ($(TARGET_BASE_ARCH), i386)
++ifdef CONFIG_GL_ACCEL
+ QEMU_CFLAGS += -DTARGET_OPENGL_OK
+ endif
++endif
+
+ # shared objects
+ obj-ppc-y = ppc.o
+@@ -409,8 +416,6 @@
+
+ monitor.o: hmp-commands.h qmp-commands.h
+
+-LIBS += -lGL -lGLU
+-
+ $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
+
+ obj-y += $(addprefix ../, $(common-obj-y))
+Index: qemu-0.15.1/configure
+===
+--- qemu-0.15.1.orig/configure 2012-05-14 21:23:34.0 +0800
qemu-0.15.1/configure 2012-05-14 21:23:36.0 +0800
+@@ -179,6 +179,7 @@
+ smartcard_nss=
+ usb_redir=
+ opengl=
++gl_accel=yes
+ guest_agent=yes
+
+ # parse CC options first
+@@ -739,6 +740,10 @@
+ ;;
+ --enable-opengl) opengl=yes
+ ;;
++ --disable-gl-accel) gl_accel=no
++ ;;
++ --enable-gl-accel) gl_accel=yes
++ ;;
+ --*dir)
+ ;;
+ --disable-rbd) rbd=no
+@@ -2016,6 +2021,39 @@
+ fi
+ fi
+
++#
++# GL acceleration probe depending on gl, glu and sdl
++if test $gl_accel != no ; then
++ if test $sdl = no ; then
++gl_accel=no
++echo libSDL and header no found to build opengl acceleration for
qemu-native.
++Ubuntu package names are: libsdl1.2-dev.
++Fedora package names are: SDL-devel.
++exit 1;
++ fi
++
++ gl_accel_libs=-lGL -lGLU
++ cat $TMPC EOF
++#include X11/Xlib.h
++#include GL/gl.h
++#include GL/glx.h
++#include GL/glu.h
++int main(void) { GL_VERSION; return 0; }
++EOF
++ if compile_prog -lGL -lGLU ; then
++gl_accel=yes
++libs_softmmu=$gl_accel_libs $libs_softmmu
++ else
++feature_not_found gl_accel
++gl_accel=no
++gl_accel_libs=
++echo libGL.so and libGLU.so not found to build opengl acceleration for
qemu-native.
++Ubuntu package names are: libgl1-mesa-dev, libglu1-mesa-dev and
libsdl1.2-dev.
++Fedora package names are: mesa-libGL mesa-libGLU SDL-devel.
++exit 1;
++ fi
++fi
++
+ #
+ # Check for xxxat() functions when we are building linux-user
+ # emulator. This is done because older glibc versions don't
+@@ -2717,6 +2755,7 @@
+ echo nss used $smartcard_nss
+ echo usb net redir $usb_redir
+ echo OpenGL support$opengl
++echo GL acceleration support$gl_accel
+ echo build guest agent $guest_agent
+
+ if test $sdl_too_old = yes; then
+@@ -3020,6 +3059,10 @@
+ echo CONFIG_OPENGL=y $config_host_mak
+ fi
+
++if test $gl_accel = yes ; then
++ echo CONFIG_GL_ACCEL=y $config_host_mak
++fi
++
+ # XXX: suppress that
+ if [ $bsd = yes ] ; then
+
Re: [OE-core] [PATCH 2/5 v2] rpm: Upgrade RPM to 5.4.9
On 05/17/2012 04:46 PM, Mark Hatle wrote:
Beside upreving RPM, add necessary integration pathces to libzypp.
Also change the configuration of RPM to support PACKAGECONFIG flags.
RPM is highly configurable, the default configuration is good for
minimal OE-Core use.
Mark,
I have been having an issue with the do_install seeming to hang for
rpm-native, I am still digging into this to see if it's a Bitbake issue
or something else with RPM.
A 'ps' shows the make install running, but not activity in the log file.
Sau!
Signed-off-by: Mark Hatlemark.ha...@windriver.com
---
meta/recipes-devtools/rpm/rpm/rpm-lua.patch| 29 +
.../rpm/rpm/rpm-scriptletexechelper.patch | 33 +++---
meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch | 26 ++---
.../rpm/{rpm_5.4.8.bb = rpm_5.4.9.bb} | 124
+---
.../libzypp/libzypp/libzypp-rpm549.patch | 28 +
meta/recipes-extended/libzypp/libzypp_git.bb |3 +-
6 files changed, 142 insertions(+), 101 deletions(-)
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-lua.patch
rename meta/recipes-devtools/rpm/{rpm_5.4.8.bb = rpm_5.4.9.bb} (82%)
create mode 100644 meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
b/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
new file mode 100644
index 000..980e1b1
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-lua.patch
@@ -0,0 +1,29 @@
+Add support for cross compiling lua
+
+Signed-off-by: Mark Hatlemark.ha...@windriver.com
+
+diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac
+--- rpm-5.4.9.orig/configure.ac2012-05-16 12:16:36.589813548 -0500
rpm-5.4.9/configure.ac 2012-05-16 12:26:01.070813518 -0500
+@@ -120,6 +120,9 @@
+
+ AC_PATH_PROG(AS, as, as)
+
++CC_FOR_BUILD=${CC_FOR_BUILD-\$(CC)}
++AC_SUBST(CC_FOR_BUILD)
++
+ dnl # GCC specifics
+ AC_PROG_GCC_TRADITIONAL
+ AC_ARG_ENABLE(build-pic,
+diff -ur rpm-5.4.9.orig/lua/Makefile.am rpm-5.4.9/lua/Makefile.am
+--- rpm-5.4.9.orig/lua/Makefile.am 2012-04-07 19:15:25.0 -0500
rpm-5.4.9/lua/Makefile.am 2012-05-16 12:26:19.556856688 -0500
+@@ -40,7 +40,7 @@
+
+ # --- bin2c doesn't need anything but a compiler
+ bin2c$(EXEEXT): bin2c.c
+- $(CC) -o $@ $
++ $(CC_FOR_BUILD) -o $@ $
+
+ liblua_la_SOURCES =
+ liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
b/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
index e4db0e4..8a9e712 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
@@ -12,10 +12,11 @@ Upstream-Status: Pending
Signed-off-by: Mark Hatlemark.ha...@windriver.com
-diff -ur rpm-5.4.0.orig/lib/psm.c rpm-5.4.0/lib/psm.c
rpm-5.4.0.orig/lib/psm.c 2010-12-29 07:42:11.0 -0600
-+++ rpm-5.4.0/lib/psm.c2011-11-08 13:38:48.132791154 -0600
-@@ -792,6 +792,10 @@
+Index: rpm-5.4.9/lib/psm.c
+===
+--- rpm-5.4.9.orig/lib/psm.c
rpm-5.4.9/lib/psm.c
+@@ -801,6 +801,10 @@ static rpmRC runScript(rpmpsm psm, Heade
int xx;
int i;
@@ -26,23 +27,23 @@ diff -ur rpm-5.4.0.orig/lib/psm.c rpm-5.4.0/lib/psm.c
if (psm-sstates != NULL ix= 0 ix RPMSCRIPT_MAX)
ssp = psm-sstates + ix;
if (ssp != NULL)
-@@ -858,14 +862,29 @@
+@@ -867,14 +871,29 @@ assert(he-p.str != NULL);
(F_ISSET(psm, UNORDERED) ? a : ));
if (Phe-p.argv == NULL) {
-- argv = alloca(5 * sizeof(*argv));
+- argv = (const char **) alloca(5 * sizeof(*argv));
- argv[0] = /bin/sh;
- argc = 1;
-+ argv = alloca(7 * sizeof(*argv));
++ argv = (const char **) alloca(7 * sizeof(*argv));
+ argc = 0;
+} else {
-+ argv = alloca((Phe-c + 6) * sizeof(*argv));
++ argv = (const char **) alloca((Phe-c + 6) * sizeof(*argv));
+ argc = 0;
+}
+
+#ifdef RPM_VENDOR_POKY
+if (scriptletWrapper *scriptletWrapper) {
-+argv[argc++] = scriptletWrapper;
++ argv[argc++] = scriptletWrapper;
+ argv[argc] = rpmtsRootDir(ts);
+ if (!argv[argc] || !*argv[argc])
+argv[argc] = /;
@@ -51,10 +52,10 @@ diff -ur rpm-5.4.0.orig/lib/psm.c rpm-5.4.0/lib/psm.c
+#endif
+
+if (Phe-p.argv == NULL) {
-+argv[argc++] = /bin/sh;
++ argv[argc++] = /bin/sh;
ldconfig_done = 0;
} else {
-- argv = alloca((Phe-c + 4) * sizeof(*argv));
+- argv = (const char **) alloca((Phe-c + 4) * sizeof(*argv));
- memcpy(argv, Phe-p.argv, Phe-c * sizeof(*argv));
- argc = Phe-c;
+ memcpy((argv + argc), Phe-p.argv, Phe-c * sizeof(*argv));
@@ -62,7 +63,7 @@ diff -ur rpm-5.4.0.orig/lib/psm.c rpm-5.4.0/lib/psm.c
ldconfig_done = (ldconfig_path !strcmp(argv[0], ldconfig_path)
? 1 : 0);
}
-@@ -916,7
[OE-core] [PATCH 0/7] Sanity class clean ups
My recent change to the sanity class to warn users when they don't have R/W permission to their SSTATE_CACHE directory has caused at least a couple of users trouble, including the Yocto project autobuilder. I have been unable to reproduce the issue but after discussionwith Elizabeth and Chris on #yocto I came up with the following series. The series includes a revert my original change as it seems the simple logic has severla edge cases. I replace it later in the series with a simple piggy-back on the existing check_create_long_filename() call, where I make the suggestion of using SSTATE_MIRRORS if that call fails with Permission denied when called against SSTATE_DIR. This check has been in use for some time and, to the best of my knowledge, doesn't trigger invalid failures. Thanks to Chris and Elizabeth for pointers as to why this was failing. Cheers, Joshua The following changes since commit e6333825c3482a559a0c0499e17f8f48d3042ddf: tune-mips64.inc: Add new tune file for mips64 big-endian (2012-05-20 20:24:37 -0700) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib josh/sanity http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/sanity Joshua Lock (7): Revert sanity.bbclass: check user can read and write to SSTATE_DIR sanity.bbclass: copy the data store and finalise before running checks sanity.bbclass: data.getVar(VAR, obj, exp) - obj.getVar(VAR, exp) sanity.bbclass: add newline to check_create_long_filename failure message sanity.bbclass: add extra information when SSTATE_CACHE unusable sanity.bbclass: catch an extra exception in check_create_long_filename sanity.bbclass: check sanity at BuildStarted rather than ConfigParsed meta/classes/sanity.bbclass | 153 ++- 1 files changed, 78 insertions(+), 75 deletions(-) -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/7] sanity.bbclass: data.getVar(VAR, obj, exp) - obj.getVar(VAR, exp)
Replace calls to data.getVar(VARIABLE, data_object, expand) to
direct calls to the getVar method the the data_object.
Signed-off-by: Joshua Lock j...@linux.intel.com
---
meta/classes/sanity.bbclass | 60 +-
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 5361f1f..5cf9ea1 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -236,20 +236,20 @@ def check_sanity_validmachine(sanity_data):
messages =
# Check TUNE_ARCH is set
-if data.getVar('TUNE_ARCH', sanity_data, True) == 'INVALID':
+if sanity_data.getVar('TUNE_ARCH', True) == 'INVALID':
messages = messages + 'TUNE_ARCH is unset. Please ensure your MACHINE
configuration includes a valid tune configuration file which will set this
correctly.\n'
# Check TARGET_ARCH is set correctly
-if data.getVar('TARGE_ARCH', sanity_data, False) == '${TUNE_ARCH}':
+if sanity_data.getVar('TARGE_ARCH', False) == '${TUNE_ARCH}':
messages = messages + 'TARGET_ARCH is being overwritten, likely by
your MACHINE configuration files.\nPlease use a valid tune configuration file
which should set this correctly automatically\nand avoid setting this in the
machine configuration. See the OE-Core mailing list for more information.\n'
# Check TARGET_OS is set
-if data.getVar('TARGET_OS', sanity_data, True) == 'INVALID':
+if sanity_data.getVar('TARGET_OS', True) == 'INVALID':
messages = messages + 'Please set TARGET_OS directly, or choose a
MACHINE or DISTRO that does so.\n'
# Check that we don't have duplicate entries in PACKAGE_ARCHS that
TUNE_PKGARCH is in PACKAGE_ARCHS
-pkgarchs = data.getVar('PACKAGE_ARCHS', sanity_data, True)
-tunepkg = data.getVar('TUNE_PKGARCH', sanity_data, True)
+pkgarchs = sanity_data.getVar('PACKAGE_ARCHS', True)
+tunepkg = sanity_data.getVar('TUNE_PKGARCH', True)
tunefound = False
seen = {}
dups = []
@@ -281,7 +281,7 @@ def check_sanity(sanity_data):
import commands
# Check the bitbake version meets minimum requirements
-minversion = data.getVar('BB_MIN_VERSION', sanity_data , True)
+minversion = sanity_data.getVar('BB_MIN_VERSION', True)
if not minversion:
# Hack: BB_MIN_VERSION hasn't been parsed yet so return
# and wait for the next call
@@ -303,7 +303,7 @@ def check_sanity(sanity_data):
messages = messages + 'Bitbake version %s is required and version %s
was found\n' % (minversion, __version__)
# Check that the MACHINE is valid, if it is set
-if data.getVar('MACHINE', sanity_data, True):
+if sanity_data.getVar('MACHINE', True):
if not check_conf_exists(conf/machine/${MACHINE}.conf, sanity_data):
messages = messages + 'Please set a valid MACHINE in your
local.conf or environment\n'
else:
@@ -312,33 +312,33 @@ def check_sanity(sanity_data):
messages = messages + 'Please set a MACHINE in your local.conf or
environment\n'
# Check we are using a valid lacal.conf
-current_conf = data.getVar('CONF_VERSION', sanity_data, True)
-conf_version = data.getVar('LOCALCONF_VERSION', sanity_data, True)
+current_conf = sanity_data.getVar('CONF_VERSION', True)
+conf_version = sanity_data.getVar('LOCALCONF_VERSION', True)
if current_conf != conf_version:
messages = messages + Your version of local.conf was generated from
an older version of local.conf.sample and there have been updates made to this
file. Please compare the two files and merge any changes before
continuing.\nMatching the version numbers will remove this message.\n\meld
conf/local.conf conf/local.conf.sample\ is a good way to visualise the
changes.\n
# Check bblayers.conf is valid
-current_lconf = data.getVar('LCONF_VERSION', sanity_data, True)
-lconf_version = data.getVar('LAYER_CONF_VERSION', sanity_data, True)
+current_lconf = sanity_data.getVar('LCONF_VERSION', True)
+lconf_version = sanity_data.getVar('LAYER_CONF_VERSION', True)
if current_lconf != lconf_version:
messages = messages + Your version of bblayers.conf was generated
from an older version of bblayers.conf.sample and there have been updates made
to this file. Please compare the two files and merge any changes before
continuing.\nMatching the version numbers will remove this message.\n\meld
conf/bblayers.conf conf/bblayers.conf.sample\ is a good way to visualise the
changes.\n
# If we have a site.conf, check it's valid
if check_conf_exists(conf/site.conf, sanity_data):
-current_sconf = data.getVar('SCONF_VERSION', sanity_data, True)
-sconf_version = data.getVar('SITE_CONF_VERSION', sanity_data, True)
+current_sconf = sanity_data.getVar('SCONF_VERSION', True)
+sconf_version = sanity_data.getVar('SITE_CONF_VERSION', True)
if
[OE-core] [PATCH 1/7] Revert sanity.bbclass: check user can read and write to SSTATE_DIR
This has caused problems for several users, including the Yocto Project autobuilder. Since the message was added in order to be more user friendly revert the change. This reverts commit 0c0c4efbf92bcf0f8942f17c18525a4b4ed1798c. --- meta/classes/sanity.bbclass | 17 +++-- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index ff3c413..05545f4 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -96,16 +96,10 @@ def check_conf_exists(fn, data): def check_sanity_sstate_dir_change(sstate_dir, data): # Sanity checks to be done when the value of SSTATE_DIR changes +# Check that SSTATE_DIR isn't on a filesystem with limited filename length (eg. eCryptFS) testmsg = if sstate_dir != : -# Check that the user can read and write to SSTATE_DIR -sstatemsg = check_can_read_write_directory(sstate_dir) or None -if sstatemsg: -sstatemsg = sstatemsg + . You could try using it as an SSTATE_MIRRORS instead of SSTATE_CACHE.\n -testmsg = testmsg + sstatemsg -# Check that SSTATE_DIR isn't on a filesystem with limited filename length (eg. eCryptFS) -testmsg = testmsg + check_create_long_filename(sstate_dir, SSTATE_DIR) - +testmsg = check_create_long_filename(sstate_dir, SSTATE_DIR) return testmsg def check_sanity_tmpdir_change(tmpdir, data): @@ -156,12 +150,7 @@ def check_create_long_filename(filepath, pathname): if errno == 36: # ENAMETOOLONG return Failed to create a file with a long name in %s. Please use a filesystem that does not unreasonably limit filename length.\n % pathname else: -return Failed to create a file in %s: %s\n % (pathname, strerror) -return - -def check_can_read_write_directory(directory): -if not os.access(directory, os.R_OK|os.W_OK): - return Insufficient permissions for %s % directory +return Failed to create a file in %s: %s % (pathname, strerror) return def check_connectivity(d): -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/7] sanity.bbclass: copy the data store and finalise before running checks
At the ConfigParsed event the datastore has yet to be finalised and thus
appends and overrides have not been set.
To ensure the sanity check is being run against the configuration values
the user has set call finalize() on a copy of the datastore and pass that
for all sanity checks.
Signed-off-by: Joshua Lock j...@linux.intel.com
---
meta/classes/sanity.bbclass | 129 +++
1 files changed, 69 insertions(+), 60 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 05545f4..5361f1f 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -182,8 +182,8 @@ def check_connectivity(d):
return retval
-def check_supported_distro(e):
-tested_distros = e.data.getVar('SANITY_TESTED_DISTROS', True)
+def check_supported_distro(sanity_data):
+tested_distros = sanity_data.getVar('SANITY_TESTED_DISTROS', True)
if not tested_distros:
return
@@ -230,26 +230,26 @@ def check_supported_distro(e):
bb.warn('Host distribution could not be determined; you may possibly
experience unexpected failures. It is recommended that you use a tested
distribution.')
# Checks we should only make if MACHINE is set correctly
-def check_sanity_validmachine(e):
+def check_sanity_validmachine(sanity_data):
from bb import data
messages =
# Check TUNE_ARCH is set
-if data.getVar('TUNE_ARCH', e.data, True) == 'INVALID':
+if data.getVar('TUNE_ARCH', sanity_data, True) == 'INVALID':
messages = messages + 'TUNE_ARCH is unset. Please ensure your MACHINE
configuration includes a valid tune configuration file which will set this
correctly.\n'
# Check TARGET_ARCH is set correctly
-if data.getVar('TARGE_ARCH', e.data, False) == '${TUNE_ARCH}':
+if data.getVar('TARGE_ARCH', sanity_data, False) == '${TUNE_ARCH}':
messages = messages + 'TARGET_ARCH is being overwritten, likely by
your MACHINE configuration files.\nPlease use a valid tune configuration file
which should set this correctly automatically\nand avoid setting this in the
machine configuration. See the OE-Core mailing list for more information.\n'
# Check TARGET_OS is set
-if data.getVar('TARGET_OS', e.data, True) == 'INVALID':
+if data.getVar('TARGET_OS', sanity_data, True) == 'INVALID':
messages = messages + 'Please set TARGET_OS directly, or choose a
MACHINE or DISTRO that does so.\n'
# Check that we don't have duplicate entries in PACKAGE_ARCHS that
TUNE_PKGARCH is in PACKAGE_ARCHS
-pkgarchs = data.getVar('PACKAGE_ARCHS', e.data, True)
-tunepkg = data.getVar('TUNE_PKGARCH', e.data, True)
+pkgarchs = data.getVar('PACKAGE_ARCHS', sanity_data, True)
+tunepkg = data.getVar('TUNE_PKGARCH', sanity_data, True)
tunefound = False
seen = {}
dups = []
@@ -271,7 +271,7 @@ def check_sanity_validmachine(e):
return messages
-def check_sanity(e):
+def check_sanity(sanity_data):
from bb import note, error, data, __version__
try:
@@ -281,7 +281,7 @@ def check_sanity(e):
import commands
# Check the bitbake version meets minimum requirements
-minversion = data.getVar('BB_MIN_VERSION', e.data , True)
+minversion = data.getVar('BB_MIN_VERSION', sanity_data , True)
if not minversion:
# Hack: BB_MIN_VERSION hasn't been parsed yet so return
# and wait for the next call
@@ -303,42 +303,42 @@ def check_sanity(e):
messages = messages + 'Bitbake version %s is required and version %s
was found\n' % (minversion, __version__)
# Check that the MACHINE is valid, if it is set
-if data.getVar('MACHINE', e.data, True):
-if not check_conf_exists(conf/machine/${MACHINE}.conf, e.data):
+if data.getVar('MACHINE', sanity_data, True):
+if not check_conf_exists(conf/machine/${MACHINE}.conf, sanity_data):
messages = messages + 'Please set a valid MACHINE in your
local.conf or environment\n'
else:
-messages = messages + check_sanity_validmachine(e)
+messages = messages + check_sanity_validmachine(sanity_data)
else:
messages = messages + 'Please set a MACHINE in your local.conf or
environment\n'
# Check we are using a valid lacal.conf
-current_conf = data.getVar('CONF_VERSION', e.data, True)
-conf_version = data.getVar('LOCALCONF_VERSION', e.data, True)
+current_conf = data.getVar('CONF_VERSION', sanity_data, True)
+conf_version = data.getVar('LOCALCONF_VERSION', sanity_data, True)
if current_conf != conf_version:
messages = messages + Your version of local.conf was generated from
an older version of local.conf.sample and there have been updates made to this
file. Please compare the two files and merge any changes before
continuing.\nMatching the version numbers will remove this message.\n\meld
conf/local.conf conf/local.conf.sample\ is a good way to
[OE-core] [PATCH 6/7] sanity.bbclass: catch an extra exception in check_create_long_filename
The call to bb.mkdirhier() in check_create_long_filename() can fail with an OSError, explicitly catch this and report something useful to the user. Signed-off-by: Joshua Lock j...@linux.intel.com --- meta/classes/sanity.bbclass |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index e86edf7..4b52699 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -154,6 +154,8 @@ def check_create_long_filename(filepath, pathname): return Failed to create a file with a long name in %s. Please use a filesystem that does not unreasonably limit filename length.\n % pathname else: return Failed to create a file in %s: %s.\n % (pathname, strerror) +except OSError as (errno, strerror): +return Failed to create %s directory in which to run long name sanity check: %s.\n % (pathname, strerror) return def check_connectivity(d): -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] sanity.bbclass: add extra information when SSTATE_CACHE unusable
If the user does not have write permissions to SSTATE_CACHE, detected by
the check_create_long_filename() test failing with a Permission denied
value in strerror, then suggest they might want to use the location as
an entry in SSTATE_MIRRORS.
Signed-off-by: Joshua Lock j...@linux.intel.com
---
meta/classes/sanity.bbclass |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 39da14b..e86edf7 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -100,6 +100,9 @@ def check_sanity_sstate_dir_change(sstate_dir, data):
testmsg =
if sstate_dir != :
testmsg = check_create_long_filename(sstate_dir, SSTATE_DIR)
+# If we don't have permissions to SSTATE_DIR, suggest the user set it
as an SSTATE_MIRRORS
+if testmsg.split(': ')[1].strip() == Permission denied.:
+testmsg = testmsg + You could try using %s in SSTATE_MIRRORS
rather than as an SSTATE_CACHE.\n % (sstate_dir)
return testmsg
def check_sanity_tmpdir_change(tmpdir, data):
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] sanity.bbclass: check sanity at BuildStarted rather than ConfigParsed
This enables a user to use bitbake -e even when the sanity checks are
failing.
Signed-off-by: Joshua Lock j...@linux.intel.com
---
meta/classes/sanity.bbclass |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 4b52699..689155c 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -539,7 +539,7 @@ def copy_data(e):
addhandler check_sanity_eventhandler
python check_sanity_eventhandler() {
-if bb.event.getName(e) == ConfigParsed and
e.data.getVar(BB_WORKERCONTEXT, True) != 1 and
e.data.getVar(DISABLE_SANITY_CHECKS, True) != 1:
+if bb.event.getName(e) == BuildStarted and
e.data.getVar(BB_WORKERCONTEXT, True) != 1 and
e.data.getVar(DISABLE_SANITY_CHECKS, True) != 1:
sanity_data = copy_data(e)
check_sanity(sanity_data)
elif bb.event.getName(e) == SanityCheck:
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/7] Sanity class clean ups
This series looks quite sane to me. Nicely done. -- Christopher Larson On Wednesday, May 23, 2012 at 5:02 PM, Joshua Lock wrote: My recent change to the sanity class to warn users when they don't have R/W permission to their SSTATE_CACHE directory has caused at least a couple of users trouble, including the Yocto project autobuilder. I have been unable to reproduce the issue but after discussionwith Elizabeth and Chris on #yocto I came up with the following series. The series includes a revert my original change as it seems the simple logic has severla edge cases. I replace it later in the series with a simple piggy-back on the existing check_create_long_filename() call, where I make the suggestion of using SSTATE_MIRRORS if that call fails with Permission denied when called against SSTATE_DIR. This check has been in use for some time and, to the best of my knowledge, doesn't trigger invalid failures. Thanks to Chris and Elizabeth for pointers as to why this was failing. Cheers, Joshua The following changes since commit e6333825c3482a559a0c0499e17f8f48d3042ddf: tune-mips64.inc: Add new tune file for mips64 big-endian (2012-05-20 20:24:37 -0700) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib (http://git.openembedded.org/openembedded-core-contrib) josh/sanity http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/sanity Joshua Lock (7): Revert sanity.bbclass: check user can read and write to SSTATE_DIR sanity.bbclass: copy the data store and finalise before running checks sanity.bbclass: data.getVar(VAR, obj, exp) - obj.getVar(VAR, exp) sanity.bbclass: add newline to check_create_long_filename failure message sanity.bbclass: add extra information when SSTATE_CACHE unusable sanity.bbclass: catch an extra exception in check_create_long_filename sanity.bbclass: check sanity at BuildStarted rather than ConfigParsed meta/classes/sanity.bbclass | 153 ++- 1 files changed, 78 insertions(+), 75 deletions(-) -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org (mailto:Openembedded-core@lists.openembedded.org) http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/7] sanity.bbclass: add extra information when SSTATE_CACHE unusable
On 23/05/12 17:03, Joshua Lock wrote:
If the user does not have write permissions to SSTATE_CACHE, detected by
the check_create_long_filename() test failing with a Permission denied
value in strerror, then suggest they might want to use the location as
an entry in SSTATE_MIRRORS.
Signed-off-by: Joshua Lockj...@linux.intel.com
---
meta/classes/sanity.bbclass |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 39da14b..e86edf7 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -100,6 +100,9 @@ def check_sanity_sstate_dir_change(sstate_dir, data):
testmsg =
if sstate_dir != :
testmsg = check_create_long_filename(sstate_dir, SSTATE_DIR)
+# If we don't have permissions to SSTATE_DIR, suggest the user set it
as an SSTATE_MIRRORS
+if testmsg.split(': ')[1].strip() == Permission denied.:
+testmsg = testmsg + You could try using %s in SSTATE_MIRRORS rather
than as an SSTATE_CACHE.\n % (sstate_dir)
return testmsg
Whoops. This one breaks when check_create_long_filename() succeeds. I've
updated the git repo with the following hunk instead of above:
+# If we don't have permissions to SSTATE_DIR, suggest the user
set it as an SSTATE_MIRRORS
+try:
+err = testmsg.split(': ')[1].strip()
+if err == Permission denied.:
+testmsg = testmsg + You could try using %s in
SSTATE_MIRRORS rather than as an SSTATE_CACHE.\n % (sstate_dir)
+except IndexError:
+pass
Tested with both an SSTATE_DIR I can write to and one I can't.
Thanks,
Joshua
def check_sanity_tmpdir_change(tmpdir, data):
--
Joshua Lock
Yocto Project
Intel Open Source Technology Centre
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] lttng2-ust: updated to version 2.0.2
On 05/22/2012 03:20 AM, Bogdan Marinescu wrote:
Tested with 'lttv' on core-image-lsb.
Signed-off-by: Bogdan Marinescubogdan.a.marine...@intel.com
---
.../{lttng2-ust_1.9.4.bb = lttng2-ust_2.0.2.bb} |8
1 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-kernel/lttng-2.0/{lttng2-ust_1.9.4.bb =
lttng2-ust_2.0.2.bb} (81%)
This update seems to have broken lttng-tools, which may share an API
with this package. Is there an update for lttng-tools also?
Sau!
diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb
b/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
similarity index 81%
rename from meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb
rename to meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
index 87d866e..8f650a4 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng2-ust_1.9.4.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
@@ -3,8 +3,8 @@ DESCRIPTION = The LTTng UST 2.0 package contains the userspace
tracer library t
HOMEPAGE = http://lttng.org/lttng2.0;
BUGTRACKER = n/a
-LICENSE = LGPLv2.1+ BSD
-LIC_FILES_CHKSUM = file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
+LICENSE = LGPLv2.1+ BSD GPLv2
+LIC_FILES_CHKSUM = file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \
file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \
file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44
@@ -12,8 +12,8 @@ inherit autotools
DEPENDS = liburcu util-linux
-SRCREV = 05f35f014a8c068e0d29b18629cafbfdfc1d
-PV = 1.9.4+git${SRCPV}
+SRCREV = a367ee66aad3ffd21ef64d1b24efc6f862e09562
+PV = 2.0.2+git${SRCPV}
PR = r0
SRC_URI = git://git.lttng.org/lttng-ust.git;protocol=git
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [Consolidated Pull 4/5] qemu: Add an option to remove host sdl/gl checking
On 05/23/2012 03:46 PM, Saul Wold wrote:
From: Zhai Edwinedwin.z...@intel.com
Add an PACKAGECONFIG in qemu to disable GL acceleration:
* By default configure try best to enable GL acceleration and fail when missing
host dependency(libSDL and libGL).
* End user can also choose to turn off GL capability, thus remove the host
dependence in building.
[YOCTO #2407] got fixed.
I think I found a problem with this when building for the target, so I
pulled it from the branch.
Sau!
Signed-off-by: Zhai Edwinedwin.z...@intel.com
---
.../qemu/qemu-0.15.1/opengl-disable-option.patch | 172
meta/recipes-devtools/qemu/qemu.inc| 23 +---
meta/recipes-devtools/qemu/qemu_0.15.1.bb |1 +
3 files changed, 176 insertions(+), 20 deletions(-)
create mode 100644
meta/recipes-devtools/qemu/qemu-0.15.1/opengl-disable-option.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.1/opengl-disable-option.patch
b/meta/recipes-devtools/qemu/qemu-0.15.1/opengl-disable-option.patch
new file mode 100644
index 000..d0c5f23
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.15.1/opengl-disable-option.patch
@@ -0,0 +1,172 @@
+Add an option gl-accel to disable GL acceleration:
+* When enabled, configure try best to enable GL acceleration and fail when
+ missing host dependency(libSDL and libGL), which is the default.
+* When disabled, end user choose to turn off GL capability, thus remove the
+ host dependence in building.
+
+Upstream-Status: Inappropriate [other] - depends on GL patch
+
+Signed-off-by: Zhai Edwinedwin.z...@intel.com
+
+Index: qemu-0.15.1/Makefile.target
+===
+--- qemu-0.15.1.orig/Makefile.target 2012-05-14 21:23:36.0 +0800
qemu-0.15.1/Makefile.target2012-05-14 21:26:19.0 +0800
+@@ -79,15 +79,20 @@
+ libobj-y += cpuid.o
+ endif
+ libobj-$(CONFIG_NEED_MMU) += mmu.o
++
+ ifndef CONFIG_LINUX_USER
++ifdef CONFIG_GL_ACCEL
+ libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o
+ libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o
+ else
+-ifdef CONFIG_SDL
+ libobj-$(TARGET_I386) += dummygl.o
+ libobj-$(TARGET_X86_64) += dummygl.o
+-endif
++endif #CONFIG_GL_ACCEL
++else
++libobj-$(TARGET_I386) += dummygl.o
++libobj-$(TARGET_X86_64) += dummygl.o
+ endif #CONFIG_LINUX_USER
++
+ libobj-$(TARGET_ARM) += dummygl.o
+ libobj-$(TARGET_MIPS) += dummygl.o
+ libobj-$(TARGET_MIPS64) += dummygl.o
+@@ -262,8 +267,10 @@
+ obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o
+
+ ifeq ($(TARGET_BASE_ARCH), i386)
++ifdef CONFIG_GL_ACCEL
+ QEMU_CFLAGS += -DTARGET_OPENGL_OK
+ endif
++endif
+
+ # shared objects
+ obj-ppc-y = ppc.o
+@@ -409,8 +416,6 @@
+
+ monitor.o: hmp-commands.h qmp-commands.h
+
+-LIBS += -lGL -lGLU
+-
+ $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
+
+ obj-y += $(addprefix ../, $(common-obj-y))
+Index: qemu-0.15.1/configure
+===
+--- qemu-0.15.1.orig/configure 2012-05-14 21:23:34.0 +0800
qemu-0.15.1/configure 2012-05-14 21:23:36.0 +0800
+@@ -179,6 +179,7 @@
+ smartcard_nss=
+ usb_redir=
+ opengl=
++gl_accel=yes
+ guest_agent=yes
+
+ # parse CC options first
+@@ -739,6 +740,10 @@
+ ;;
+ --enable-opengl) opengl=yes
+ ;;
++ --disable-gl-accel) gl_accel=no
++ ;;
++ --enable-gl-accel) gl_accel=yes
++ ;;
+ --*dir)
+ ;;
+ --disable-rbd) rbd=no
+@@ -2016,6 +2021,39 @@
+ fi
+ fi
+
++#
++# GL acceleration probe depending on gl, glu and sdl
++if test $gl_accel != no ; then
++ if test $sdl = no ; then
++gl_accel=no
++echo libSDL and header no found to build opengl acceleration for
qemu-native.
++Ubuntu package names are: libsdl1.2-dev.
++Fedora package names are: SDL-devel.
++exit 1;
++ fi
++
++ gl_accel_libs=-lGL -lGLU
++ cat $TMPC EOF
++#includeX11/Xlib.h
++#includeGL/gl.h
++#includeGL/glx.h
++#includeGL/glu.h
++int main(void) { GL_VERSION; return 0; }
++EOF
++ if compile_prog -lGL -lGLU ; then
++gl_accel=yes
++libs_softmmu=$gl_accel_libs $libs_softmmu
++ else
++feature_not_found gl_accel
++gl_accel=no
++gl_accel_libs=
++echo libGL.so and libGLU.so not found to build opengl acceleration for
qemu-native.
++Ubuntu package names are: libgl1-mesa-dev, libglu1-mesa-dev and
libsdl1.2-dev.
++Fedora package names are: mesa-libGL mesa-libGLU SDL-devel.
++exit 1;
++ fi
++fi
++
+ #
+ # Check for xxxat() functions when we are building linux-user
+ # emulator. This is done because older glibc versions don't
+@@ -2717,6 +2755,7 @@
+ echo nss used $smartcard_nss
+ echo usb net redir $usb_redir
+ echo OpenGL support$opengl
++echo GL acceleration support$gl_accel
+ echo build guest agent $guest_agent
+
+ if test $sdl_too_old = yes; then
+@@ -3020,6 +3059,10 @@
+ echo CONFIG_OPENGL=y $config_host_mak
+
[OE-core] [RFC v2 1/2] pm-utils: Clean up file ordering
Signed-off-by: Saul Wold s...@linux.intel.com
---
meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb | 11 ++-
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
index 92d65c1..6c41c05 100644
--- a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
+++ b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
@@ -7,18 +7,19 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://src/pm-pmu.c;beginline=1;endline=22;md5=3c1ddbc54e735fb4a0386e14c78a3147
PR = r1
-RDEPENDS_${PN} = grep
SRC_URI = http://pm-utils.freedesktop.org/releases/pm-utils-${PV}.tar.gz;
+SRC_URI[md5sum] = 1742a556089c36c3a89eb1b957da5a60
+SRC_URI[sha256sum] =
8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b
+
inherit pkgconfig autotools
-FILES_${PN}-dbg += ${libdir}/pm-utils/bin/.debug \
- ${datadir}/doc/pm-utils/README.debugging
+RDEPENDS_${PN} = grep
do_configure_prepend () {
autoreconf -f -i -s
}
-SRC_URI[md5sum] = 1742a556089c36c3a89eb1b957da5a60
-SRC_URI[sha256sum] =
8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b
+FILES_${PN}-dbg += ${libdir}/pm-utils/bin/.debug \
+ ${datadir}/doc/pm-utils/README.debugging
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC v2 0/2] Package Reodering
This is still very much a work in progress, it may likely
require a PR bump of the all the recipes.
I will follow this email with a zip file of a buildhistory
diff.
There are 3 packages that I noted moved some files in a way
I did not expect, and I am not sure about:
libtool: moved *.m4 files to libtool-dev, I think libtool needs those and
it's incorrect.
libgpg and libgcrypt moved some /usr/bin/ binaries into the ${PN} package
for ${PN}-dev, which I think is correct.
The following changes since commit e6333825c3482a559a0c0499e17f8f48d3042ddf:
Please review, I thought I might need a new class, the package_core_solibs,
but I ended up only using it twice.
Thought comments, clearly a work in progress, but getting closer.
Sau!
tune-mips64.inc: Add new tune file for mips64 big-endian (2012-05-20 20:24:37
-0700)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/pkg-reorder
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/pkg-reorder
Saul Wold (2):
pm-utils: Clean up file ordering
Reorder and -dev
meta/classes/binconfig.bbclass |2 ++
meta/classes/lib_package.bbclass |6 ++
meta/classes/package_core_solibs.bbclass | 11 +++
meta/conf/bitbake.conf |6 --
meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb| 11 +++
meta/recipes-connectivity/libpcap/libpcap.inc |2 +-
meta/recipes-core/eglibc/eglibc-package.inc|2 +-
meta/recipes-core/eglibc/eglibc_2.15.bb|2 +-
meta/recipes-core/gettext/gettext_0.16.1.bb|3 ++-
meta/recipes-core/gettext/gettext_0.18.1.1.bb |4 +++-
meta/recipes-core/libxml/libxml2.inc |2 +-
meta/recipes-core/ncurses/ncurses.inc |2 +-
meta/recipes-devtools/elfutils/elfutils_0.148.bb |7 ++-
meta/recipes-extended/cups/cups14.inc |1 +
meta/recipes-extended/cups/cups_1.4.6.bb |2 +-
meta/recipes-extended/groff/groff_1.20.1.bb|4 +++-
meta/recipes-extended/procps/procps.inc|4 +---
meta/recipes-extended/slang/slang_2.2.4.bb |4 ++--
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 14 ++
meta/recipes-gnome/gthumb/gthumb_2.12.4.bb | 12
meta/recipes-graphics/directfb/directfb_1.4.15.bb |2 +-
meta/recipes-graphics/freetype/freetype_2.4.8.bb |5 +
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb |2 +-
meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb|6 --
meta/recipes-multimedia/libpng/libpng_1.2.49.bb|4 +---
meta/recipes-sato/gtk-engines/gtk-sato-engine.inc |2 +-
.../gtk-engines/gtk-sato-engine_git.bb |2 +-
meta/recipes-support/apr/apr-util_1.4.1.bb |2 +-
meta/recipes-support/apr/apr_1.4.6.bb |2 +-
meta/recipes-support/curl/curl_7.24.0.bb |2 +-
meta/recipes-support/db/db_5.1.19.bb |1 +
meta/recipes-support/gnutls/gnutls.inc |5 ++---
meta/recipes-support/gnutls/libtasn1_2.12.bb |2 +-
meta/recipes-support/gpgme/gpgme_1.3.1.bb |5 ++---
meta/recipes-support/icu/icu-3.6.inc |2 ++
meta/recipes-support/icu/icu_3.6.bb|2 +-
meta/recipes-support/libassuan/libassuan_2.0.3.bb |1 +
meta/recipes-support/libgcrypt/libgcrypt.inc |4
.../libgpg-error/libgpg-error_1.10.bb |6 +-
meta/recipes-support/libksba/libksba_1.2.0.bb |1 +
meta/recipes-support/libpcre/libpcre_8.21.bb |5 +
meta/recipes-support/libproxy/libproxy_0.4.7.bb|3 ++-
meta/recipes-support/libusb/libusb-compat_0.1.3.bb |4 +---
meta/recipes-support/libxslt/libxslt_1.1.26.bb |2 +-
meta/recipes-support/neon/neon_0.29.6.bb |2 +-
meta/recipes-support/pth/pth_2.0.7.bb |5 +
meta/recipes-support/taglib/taglib_1.6.3.bb|3 +--
47 files changed, 97 insertions(+), 86 deletions(-)
create mode 100644 meta/classes/package_core_solibs.bbclass
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC v2 2/2] Reorder and -dev
Signed-off-by: Saul Wold s...@linux.intel.com
---
meta/classes/binconfig.bbclass |2 ++
meta/classes/lib_package.bbclass |6 ++
meta/classes/package_core_solibs.bbclass | 11 +++
meta/conf/bitbake.conf |6 --
meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb|4 +++-
meta/recipes-connectivity/libpcap/libpcap.inc |2 +-
meta/recipes-core/eglibc/eglibc-package.inc|2 +-
meta/recipes-core/eglibc/eglibc_2.15.bb|2 +-
meta/recipes-core/gettext/gettext_0.16.1.bb|3 ++-
meta/recipes-core/gettext/gettext_0.18.1.1.bb |4 +++-
meta/recipes-core/libxml/libxml2.inc |2 +-
meta/recipes-core/ncurses/ncurses.inc |2 +-
meta/recipes-devtools/elfutils/elfutils_0.148.bb |7 ++-
meta/recipes-extended/cups/cups14.inc |1 +
meta/recipes-extended/cups/cups_1.4.6.bb |2 +-
meta/recipes-extended/groff/groff_1.20.1.bb|4 +++-
meta/recipes-extended/procps/procps.inc|4 +---
meta/recipes-extended/slang/slang_2.2.4.bb |4 ++--
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 14 ++
meta/recipes-gnome/gthumb/gthumb_2.12.4.bb | 12
meta/recipes-graphics/directfb/directfb_1.4.15.bb |2 +-
meta/recipes-graphics/freetype/freetype_2.4.8.bb |5 +
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb |2 +-
meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb|6 --
meta/recipes-multimedia/libpng/libpng_1.2.49.bb|4 +---
meta/recipes-sato/gtk-engines/gtk-sato-engine.inc |2 +-
.../gtk-engines/gtk-sato-engine_git.bb |2 +-
meta/recipes-support/apr/apr-util_1.4.1.bb |2 +-
meta/recipes-support/apr/apr_1.4.6.bb |2 +-
meta/recipes-support/curl/curl_7.24.0.bb |2 +-
meta/recipes-support/db/db_5.1.19.bb |1 +
meta/recipes-support/gnutls/gnutls.inc |5 ++---
meta/recipes-support/gnutls/libtasn1_2.12.bb |2 +-
meta/recipes-support/gpgme/gpgme_1.3.1.bb |5 ++---
meta/recipes-support/icu/icu-3.6.inc |2 ++
meta/recipes-support/icu/icu_3.6.bb|2 +-
meta/recipes-support/libassuan/libassuan_2.0.3.bb |1 +
meta/recipes-support/libgcrypt/libgcrypt.inc |4
.../libgpg-error/libgpg-error_1.10.bb |6 +-
meta/recipes-support/libksba/libksba_1.2.0.bb |1 +
meta/recipes-support/libpcre/libpcre_8.21.bb |5 +
meta/recipes-support/libproxy/libproxy_0.4.7.bb|3 ++-
meta/recipes-support/libusb/libusb-compat_0.1.3.bb |4 +---
meta/recipes-support/libxslt/libxslt_1.1.26.bb |2 +-
meta/recipes-support/neon/neon_0.29.6.bb |2 +-
meta/recipes-support/pth/pth_2.0.7.bb |5 +
meta/recipes-support/taglib/taglib_1.6.3.bb|3 +--
47 files changed, 93 insertions(+), 83 deletions(-)
create mode 100644 meta/classes/package_core_solibs.bbclass
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 3deb541..60012c8 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -1,3 +1,5 @@
+FILES_${PN}-dev += ${bindir}/*-config
+
# The namespaces can clash here hence the two step replace
def get_binconfig_mangle(d):
s = -e ''
diff --git a/meta/classes/lib_package.bbclass b/meta/classes/lib_package.bbclass
index 5ce8727..27c76dc 100644
--- a/meta/classes/lib_package.bbclass
+++ b/meta/classes/lib_package.bbclass
@@ -3,8 +3,6 @@ PACKAGES += ${PN}-bin
FILES_${PN} = ${libexecdir} ${libdir}/lib*${SOLIBS} \
${sysconfdir} ${sharedstatedir} ${localstatedir} \
${base_libdir}/*${SOLIBS} \
- ${datadir}/${PN} ${libdir}/${PN}
-FILES_${PN}-dev = ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
- ${libdir}/*.o ${libdir}/pkgconfig /lib/*.o \
- ${datadir}/aclocal ${bindir}/*-config
+ ${datadir}/${BPN} ${libdir}/${BPN}
+
FILES_${PN}-bin = ${bindir}/* ${sbindir}/* /bin/* /sbin/*
diff --git a/meta/classes/package_core_solibs.bbclass
b/meta/classes/package_core_solibs.bbclass
new file mode 100644
index 000..5675ab8
--- /dev/null
+++ b/meta/classes/package_core_solibs.bbclass
@@ -0,0 +1,11 @@
+
+# Some packages have the version preceeding the .so instead
+# properly versioned .so.version, so we need to reorder and
+# repackage.
+FILES_${PN} += ${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so
+PACKAGES := ${@oe_filter_out('${PN}-dev', '${PACKAGES}', d)}
+PACKAGES += ${PN}-dev
+
+# The package contains symlinks that trip up insane
+INSANE_SKIP_${PN} = dev-so
+
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7073018..108a4c3 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -253,7 +253,7 @@
[OE-core] Buildhistory diff for package reordering
This buildhistory also included the change from xserver-kdrive to xorg-xserver. This was from 2 back to back builds without reordering and then with. Comments? -- Sau! Saul Wold Yocto Component Wrangler @ Intel Yocto Project / Poky Build System ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [Consolidated Pull 4/5] qemu: Add an option to remove host sdl/gl checking
On 05/24/2012 11:44 AM, Saul Wold wrote: On 05/23/2012 03:46 PM, Saul Wold wrote: From: Zhai Edwinedwin.z...@intel.com Add an PACKAGECONFIG in qemu to disable GL acceleration: * By default configure try best to enable GL acceleration and fail when missing host dependency(libSDL and libGL). * End user can also choose to turn off GL capability, thus remove the host dependence in building. [YOCTO #2407] got fixed. I think I found a problem with this when building for the target, so I pulled it from the branch. Which target? Can you attach build log? Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 08/28] external-sourcery-toolchain: ignore GNU_HASH issues with its packages
From: Christopher Larson kerg...@gmail.com
Signed-off-by: Christopher Larson kerg...@gmail.com
---
.../meta/external-sourcery-toolchain.bb|6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/meta/external-sourcery-toolchain.bb
b/meta/recipes-core/meta/external-sourcery-toolchain.bb
index a14e958..b8cb6d9 100644
--- a/meta/recipes-core/meta/external-sourcery-toolchain.bb
+++ b/meta/recipes-core/meta/external-sourcery-toolchain.bb
@@ -92,6 +92,12 @@ PACKAGES =+ libgcc libgcc-dev libstdc++ libstdc++-dev
libstdc++-staticdev linux
# This test should be fixed to ignore .a files in .debug dirs
INSANE_SKIP_${PN}-dbg = staticdev
+# We don't care about GNU_HASH in prebuilt binaries
+INSANE_SKIP_${PN}-utils += ldflags
+INSANE_SKIP_libstdc++ += ldflags
+INSANE_SKIP_libgcc += ldflags
+INSANE_SKIP_gdbserver += ldflags
+
PKG_${PN} = eglibc
PKG_${PN}-dev = eglibc-dev
PKG_${PN}-staticdev = eglibc-staticdev
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 06/28] tcmode-external-csl: preferred external-csl-toolchain's gdbserver
From: Christopher Larson kerg...@gmail.com Signed-off-by: Christopher Larson kerg...@gmail.com --- meta/conf/distro/include/tcmode-external-csl.inc |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/conf/distro/include/tcmode-external-csl.inc b/meta/conf/distro/include/tcmode-external-csl.inc index 731780b..0fa2ee1 100644 --- a/meta/conf/distro/include/tcmode-external-csl.inc +++ b/meta/conf/distro/include/tcmode-external-csl.inc @@ -34,6 +34,7 @@ PREFERRED_PROVIDER_virtual/libintl = external-csl-toolchain PREFERRED_PROVIDER_virtual/libiconv = external-csl-toolchain PREFERRED_PROVIDER_glibc-thread-db = external-csl-toolchain PREFERRED_PROVIDER_virtual/linux-libc-headers = external-csl-toolchain +PREFERRED_PROVIDER_gdbserver ??= external-csl-toolchain # No need to re-compile the locale files GLIBC_INTERNAL_USE_BINARY_LOCALE = precompiled -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 01/28] qemumips64.conf: Add machine configuration for mips64(eb)
From: Khem Raj raj.k...@gmail.com New machine description for qemu emulating malta64/mips64 big-endian system Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/conf/machine/qemumips64.conf | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 meta/conf/machine/qemumips64.conf diff --git a/meta/conf/machine/qemumips64.conf b/meta/conf/machine/qemumips64.conf new file mode 100644 index 000..8e9a488 --- /dev/null +++ b/meta/conf/machine/qemumips64.conf @@ -0,0 +1,13 @@ +#@TYPE: Machine +#@NAME: mti_malta64 MIPS64 +#@DESCRIPTION: mti_malta64 + +require conf/machine/include/qemu.inc +require conf/machine/include/tune-mips64.inc + +KERNEL_IMAGETYPE = vmlinux +KERNEL_ALT_IMAGETYPE = vmlinux.bin + +SERIAL_CONSOLE = 115200 ttyS0 + +MACHINE_EXTRA_RRECOMMENDS = kernel-modules -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 02/28] qemush4.conf: Add machine configuration for qemush4
From: Khem Raj raj.k...@gmail.com SH4 qemu emulation using rts7751r2dplus board Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/conf/machine/qemush4.conf | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 meta/conf/machine/qemush4.conf diff --git a/meta/conf/machine/qemush4.conf b/meta/conf/machine/qemush4.conf new file mode 100644 index 000..acf7faf --- /dev/null +++ b/meta/conf/machine/qemush4.conf @@ -0,0 +1,13 @@ +#@TYPE: Machine +#@NAME: base +#@DESCRIPTION: rts7751r2dplus + +require conf/machine/include/qemu.inc +require conf/machine/include/tune-sh4.inc + +KERNEL_IMAGETYPE = zImage + +SERIAL_CONSOLE = 115200 ttySC1 noiotrap earlyprintk=sh-sci.1 + +MACHINE_EXTRA_RRECOMMENDS = kernel-modules + -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 07/28] Rename 'external-csl' to 'external-sourcery'
From: Christopher Larson kerg...@gmail.com
This is a rename per the purchase of CodeSourcery by Mentor Graphics
Corporation, and associated naming change.
Signed-off-by: Christopher Larson kerg...@gmail.com
---
meta/conf/distro/include/tcmode-external-csl.inc | 120 +---
.../distro/include/tcmode-external-sourcery.inc| 118 +++
...toolchain.bb = external-sourcery-toolchain.bb} |0
.../SUPPORTED |0
4 files changed, 120 insertions(+), 118 deletions(-)
create mode 100644 meta/conf/distro/include/tcmode-external-sourcery.inc
rename meta/recipes-core/meta/{external-csl-toolchain.bb =
external-sourcery-toolchain.bb} (100%)
rename meta/recipes-core/meta/{external-csl-toolchain =
external-sourcery-toolchain}/SUPPORTED (100%)
diff --git a/meta/conf/distro/include/tcmode-external-csl.inc
b/meta/conf/distro/include/tcmode-external-csl.inc
index 0fa2ee1..9e530ab 100644
--- a/meta/conf/distro/include/tcmode-external-csl.inc
+++ b/meta/conf/distro/include/tcmode-external-csl.inc
@@ -1,118 +1,2 @@
-#
-# Configuration to use external CSL toolchain
-#
-
-EXTERNAL_TOOLCHAIN ?= /usr/local/csl/${TARGET_ARCH}
-
-TOOLCHAIN_PATH_ADD = ${EXTERNAL_TOOLCHAIN}/bin:
-PATH =. ${TOOLCHAIN_PATH_ADD}
-
-CSL_TARGET_SYS_powerpc ?= powerpc-linux-gnu
-CSL_TARGET_SYS_powerpc64 ?= powerpc-linux-gnu
-CSL_TARGET_SYS_arm ?= arm-none-linux-gnueabi
-CSL_TARGET_SYS_mips ?= mips-linux-gnu
-CSL_TARGET_SYS_mipsel ?= mips-linux-gnu
-CSL_TARGET_SYS_mips64 ?= mips-linux-gnu
-CSL_TARGET_SYS_i686 ?= i686-pc-linux-gnu
-CSL_TARGET_SYS_i586 ?= i686-pc-linux-gnu
-CSL_TARGET_SYS = ${TARGET_SYS}
-
-TARGET_PREFIX = ${CSL_TARGET_SYS}-
-
-PREFERRED_PROVIDER_linux-libc-headers = external-csl-toolchain
-PREFERRED_PROVIDER_linux-libc-headers-dev = external-csl-toolchain
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = external-csl-toolchain
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial =
external-csl-toolchain
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate =
external-csl-toolchain
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = external-csl-toolchain
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = external-csl-toolchain
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc =
external-csl-toolchain
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs =
external-csl-toolchain
-PREFERRED_PROVIDER_libgcc = external-csl-toolchain
-PREFERRED_PROVIDER_virtual/libc = external-csl-toolchain
-PREFERRED_PROVIDER_virtual/libintl = external-csl-toolchain
-PREFERRED_PROVIDER_virtual/libiconv = external-csl-toolchain
-PREFERRED_PROVIDER_glibc-thread-db = external-csl-toolchain
-PREFERRED_PROVIDER_virtual/linux-libc-headers = external-csl-toolchain
-PREFERRED_PROVIDER_gdbserver ??= external-csl-toolchain
-
-# No need to re-compile the locale files
-GLIBC_INTERNAL_USE_BINARY_LOCALE = precompiled
-ENABLE_BINARY_LOCALE_GENERATION =
-
-TOOLCHAIN_OPTIONS = --sysroot=${STAGING_DIR_HOST}
-
-# Translate to CodeSourcery's names for their optimized files in the toolchain
-def csl_target_core(d):
-coredata = {
-'armv7a-vfp-neon': 'armv7-a-neon',
-'i586': 'sgxx-glibc',
-'i686': 'sgxx-glibc',
-'core2': 'sgxx-glibc',
-'mips': 'mips32',
-'mipsel': 'el',
-'powerpc-nf': 'nof',
-'ppce500': 'te500v1',
-'ppce500mc': 'te500mc',
-'ppce500v2': 'te500v2',
-'ppce600': 'te600'
-}
-return coredata.get(d.getVar('TUNE_PKGARCH', True), '')
-
-CSL_TARGET_CORE ?= ${@csl_target_core(d)}
-
-# Unfortunately, the CSL ia32 toolchain has non-prefixed binaries in its
-# bindir (e.g. gcc, ld). To avoid this messing up our build, we avoid adding
-# this bindir to our PATH, and instead add symlinks to the prefixed binaries
-# to our staging toolchain bindir.
-
-python toolchain_metadata_setup () {
-if not isinstance(e, bb.event.ConfigParsed):
-return
-
-d = e.data
-
-l = d.createCopy()
-l.finalize()
-if os.path.exists(bb.data.expand('${EXTERNAL_TOOLCHAIN}/bin/gcc', l)):
-d.setVar('TOOLCHAIN_PATH_ADD', '')
-}
-addhandler toolchain_metadata_setup
-
-python toolchain_setup () {
-if not isinstance(e, bb.event.BuildStarted):
-return
-
-d = e.data
-
-if not d.getVar('TOOLCHAIN_PATH_ADD', True):
-populate_toolchain_links(d)
-}
-addhandler toolchain_setup
-
-def populate_toolchain_links(d):
-import errno
-import os
-from glob import glob
-
-d = d.createCopy()
-d.finalize()
-
-pattern = d.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}*')
-files = glob(pattern)
-if not files:
-bb.fatal(Unable to populate toolchain binary symlinks in %s %
pattern)
-
-bindir = d.getVar('STAGING_BINDIR_TOOLCHAIN', True)
-bb.mkdirhier(bindir)
-for f in files:
-base = os.path.basename(f)
-newpath = os.path.join(bindir, base)
-try:
-os.symlink(f, newpath)
-
[OE-core] [Consolidated Pull 05/28] gcc: Grok for callconvention-hard to enable hard float
From: Khem Raj raj.k...@gmail.com
If callconvention-hard is set then we build gcc defaulting
to hard-float ABI
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/recipes-devtools/gcc/gcc-common.inc |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc
b/meta/recipes-devtools/gcc/gcc-common.inc
index f550aab..c479403 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -10,6 +10,8 @@ inherit autotools gettext
FILESDIR = ${@os.path.dirname(d.getVar('FILE',1))}/gcc-${PV}
def get_gcc_fpu_setting(bb, d):
+if d.getVar('ARMPKGSFX_EABI', True) is hf:
+return --with-float=hard
if d.getVar('TARGET_FPU', True) in [ 'soft' ]:
return --with-float=soft
if d.getVar('TARGET_FPU', True) in [ 'ppc-efd' ]:
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 04/28] eglibc: Add ARM hf dynamic linker support
From: Khem Raj raj.k...@gmail.com The work is done in glibc upstream we backport the relevant patches Signed-off-by: Khem Raj raj.k...@gmail.com --- .../eglibc/eglibc-2.15/add_HAVE_ARM_PCS_VFP.patch | 28 ++ .../eglibc/eglibc-2.15/ldso_arm_hf_support.patch | 338 meta/recipes-core/eglibc/eglibc_2.15.bb|4 +- 3 files changed, 369 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-core/eglibc/eglibc-2.15/add_HAVE_ARM_PCS_VFP.patch create mode 100644 meta/recipes-core/eglibc/eglibc-2.15/ldso_arm_hf_support.patch diff --git a/meta/recipes-core/eglibc/eglibc-2.15/add_HAVE_ARM_PCS_VFP.patch b/meta/recipes-core/eglibc/eglibc-2.15/add_HAVE_ARM_PCS_VFP.patch new file mode 100644 index 000..0f95c2f --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.15/add_HAVE_ARM_PCS_VFP.patch @@ -0,0 +1,28 @@ +From: Carlos O'Donell carlos_odon...@mentor.com +Date: Mon, 7 May 2012 20:04:41 + (-0400) +Subject: ARM: Define HAVE_ARM_PCS_VFP in config.h. +X-Git-Url: http://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=6a43ec980c5a0500149ef37d4854eac0e270da6f;hp=05c2c9618f583ea4acd69b3fe5ae2a2922dd2ddc + +ARM: Define HAVE_ARM_PCS_VFP in config.h. + +If the compiler and flags would select the hard-float ABI +then the ARM configure fragment will set HAVE_ARM_PCS_VFP. +This is later used by the ARM shlib-versions to select +the appropriately named dynamic linker. +--- + +Upstream-Status: Backport +-Khem + +Index: libc/config.h.in +=== +--- libc.orig/config.h.in 2012-01-04 22:06:28.0 -0800 libc/config.h.in 2012-05-08 11:25:56.581079069 -0700 +@@ -233,4 +233,7 @@ + + #define HAVE_REGEX 1 + ++/* The ARM hard-float ABI is being used. */ ++#undef HAVE_ARM_PCS_VFP ++ + #endif diff --git a/meta/recipes-core/eglibc/eglibc-2.15/ldso_arm_hf_support.patch b/meta/recipes-core/eglibc/eglibc-2.15/ldso_arm_hf_support.patch new file mode 100644 index 000..7a53da6 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.15/ldso_arm_hf_support.patch @@ -0,0 +1,338 @@ +From d3b36017d43af570ca7f79e711749dd4ade76979 Mon Sep 17 00:00:00 2001 +From: Carlos O'Donell carlos_odon...@mentor.com +Date: Mon, 7 May 2012 22:14:44 -0400 +Subject: [PATCH] ARM: Use /lib/ld-linux-armhf.so.3 for the hard-float ABI. + +The hard-float ABI will now use /lib/ld-linux-armhf.so.3. +We detect the use of the hard-float ABI and select the +appropriate dynamic linker name. You must have a new or +patched compiler which also uses the new dynamic loader +name when the hard-float ABI is selected. +--- + ChangeLog.arm |8 ++ + sysdeps/arm/configure | 184 + sysdeps/arm/configure.in | 17 + sysdeps/arm/shlib-versions |8 ++- + 4 files changed, 216 insertions(+), 1 deletions(-) + mode change 100644 = 100755 sysdeps/arm/configure + +Upstream-Status: Backport +-Khem + +Index: libc/ports/sysdeps/arm/configure.in +=== +--- libc.orig/ports/sysdeps/arm/configure.in 2012-05-08 11:42:59.161128560 -0700 libc/ports/sysdeps/arm/configure.in2012-05-08 11:43:29.373130066 -0700 +@@ -18,3 +18,20 @@ + if test $libc_cv_asm_cfi_directive_sections != yes; then + AC_MSG_ERROR([need .cfi_sections in this configuration]) + fi ++ ++# We check to see if the compiler and flags are ++# selecting the hard-float ABI and if they are then ++# we set libc_cv_arm_pcs_vfp to yes which causes ++# HAVE_ARM_PCS_VFP to be defined in config.h and ++# in include/libc-symbols.h and thus available to ++# shlib-versions to select the appropriate name for ++# the dynamic linker via %ifdef. ++AC_CACHE_CHECK([whether the compiler is using the ARM hard-float ABI], ++ [libc_cv_arm_pcs_vfp], ++ [AC_EGREP_CPP(yes,[#ifdef __ARM_PCS_VFP ++ yes ++ #endif ++ ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)]) ++if test $libc_cv_arm_pcs_vfp = yes; then ++ AC_DEFINE(HAVE_ARM_PCS_VFP) ++fi +Index: libc/ports/sysdeps/arm/shlib-versions +=== +--- libc.orig/ports/sysdeps/arm/shlib-versions 2012-05-08 11:42:59.145128546 -0700 libc/ports/sysdeps/arm/shlib-versions 2012-05-08 11:43:29.409130022 -0700 +@@ -1,4 +1,10 @@ + arm.*-.*-linux-gnueabi.* DEFAULT GLIBC_2.4 + +-arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3 ++%ifdef HAVE_ARM_PCS_VFP ++# The EABI-derived hard-float ABI uses a new dynamic linker. ++arm.*-.*-linux-gnueabi.* ld=ld-linux-armhf.so.3 ++%else ++# The EABI-derived soft-float ABI continues to use ld-linux.so.3. ++arm.*-.*-linux-gnueabi.* ld=ld-linux.so.3 ++%endif + arm.*-.*-linux.* ld=ld-linux.so.2 +Index: libc/ports/sysdeps/arm/configure +=== +--- libc.orig/ports/sysdeps/arm/configure
[OE-core] [Consolidated Pull 03/28] gcc-4.7: Add knowledge about arm hf dynamic loader
From: Khem Raj raj.k...@gmail.com
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc |1 +
.../gcc/gcc-4.7/arm-hard-float-loader.patch| 48
2 files changed, 49 insertions(+), 0 deletions(-)
create mode 100644
meta/recipes-devtools/gcc/gcc-4.7/arm-hard-float-loader.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index efd166c..0321776 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -65,6 +65,7 @@ SRC_URI =
svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://libgcc-sjlj-check.patch \
file://cpp-honor-sysroot.patch \
file://mips64-default-n64.patch \
+ file://arm-hard-float-loader.patch \
S = ${TMPDIR}/work-shared/gcc-${PV}-${PR}/${BRANCH}
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/arm-hard-float-loader.patch
b/meta/recipes-devtools/gcc/gcc-4.7/arm-hard-float-loader.patch
new file mode 100644
index 000..dfa0d19
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.7/arm-hard-float-loader.patch
@@ -0,0 +1,48 @@
+This patch is still being discussed by probably is almost
+final version. We add the OE notion of multilib on top
+
+Upstream-Status: Backport [ adapted ]
+
+Signed-off-by: Khem Raj raj.k...@gmail.com
+
+Index: gcc-4_7-branch/gcc/config/arm/linux-eabi.h
+===
+--- gcc-4_7-branch.orig/gcc/config/arm/linux-eabi.h2012-04-30
15:28:31.891863845 -0700
gcc-4_7-branch/gcc/config/arm/linux-eabi.h 2012-04-30 15:37:11.531888994
-0700
+@@ -32,7 +32,8 @@
+ while (false)
+
+ /* We default to a soft-float ABI so that binaries can run on all
+- target hardware. */
++ target hardware. If you override this to use the hard-float ABI then
++ change the setting of GLIBC_DYNAMIC_LINKER_DEFAULT as well. */
+ #undef TARGET_DEFAULT_FLOAT_ABI
+ #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT
+
+@@ -59,10 +60,23 @@
+ #undef SUBTARGET_EXTRA_LINK_SPEC
+ #define SUBTARGET_EXTRA_LINK_SPEC -m TARGET_LINKER_EMULATION
+
+-/* Use ld-linux.so.3 so that it will be possible to run classic
+- GNU/Linux binaries on an EABI system. */
++/* GNU/Linux on ARM currently supports three dynamic linkers:
++ - ld-linux.so.2 - for the legacy ABI
++ - ld-linux.so.3 - for the EABI-derived soft-float ABI
++ - ld-linux-armhf.so.3 - for the EABI-derived hard-float ABI.
++ All the dynamic linkers live in /lib.
++ We default to soft-float, but this can be overridden by changing both
++ GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */
++
+ #undef GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR ld-linux.so.3
++#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT SYSTEMLIBS_DIR ld-linux.so.3
++#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT SYSTEMLIBS_DIR ld-linux-armhf.so.3
++#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
++
++ #define GLIBC_DYNAMIC_LINKER \
++%{mfloat-abi=hard: GLIBC_DYNAMIC_LINKER_HARD_FLOAT } \
++ %{mfloat-abi=soft*: GLIBC_DYNAMIC_LINKER_SOFT_FLOAT } \
++ %{!mfloat-abi=*: GLIBC_DYNAMIC_LINKER_DEFAULT }
+
+ /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
+use the GNU/Linux version, not the generic BPABI version. */
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 00/28] Fixes from various corners with [1.2.1] fixes
Richard, I have been building and running images from the following changes (not the mips64 or sh4 yet). A number of the changes below (from Robert, Nitin and Xiaofeng) are candiates for 1.2.1. The package_deb.bbclass change needs more review, I believe that Joshua also proposed a fix, but caused other breakage, this seems to resolve the problem, but I am not sure about it. Paul's change to add checksum does add some warnings, which I assume he or someone will fix shortly, they seem to be from older recipes. Thanks Sau! The following changes since commit e6333825c3482a559a0c0499e17f8f48d3042ddf: tune-mips64.inc: Add new tune file for mips64 big-endian (2012-05-20 20:24:37 -0700) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/fix http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix Andreas Oberritter (6): ppp: avoid host contamination libnss-mdns: fix postinst scripts wpa-supplicant: fix packaging error since last commit netbase: merge init script updates from upstream distutils.bbclass: don't delete .pyo files python: bump PR of packages after update of distutils.bbclass Christopher Larson (3): tcmode-external-csl: preferred external-csl-toolchain's gdbserver Rename 'external-csl' to 'external-sourcery' external-sourcery-toolchain: ignore GNU_HASH issues with its packages Enrico Scholz (1): libtool: fixed parallel build related race Joshua Lock (7): Revert sanity.bbclass: check user can read and write to SSTATE_DIR sanity.bbclass: copy the data store and finalise before running checks sanity.bbclass: data.getVar(VAR, obj, exp) - obj.getVar(VAR, exp) sanity.bbclass: add newline to check_create_long_filename failure message sanity.bbclass: add extra information when SSTATE_CACHE unusable sanity.bbclass: catch an extra exception in check_create_long_filename sanity.bbclass: check sanity at BuildStarted rather than ConfigParsed Khem Raj (5): qemumips64.conf: Add machine configuration for mips64(eb) qemush4.conf: Add machine configuration for qemush4 gcc-4.7: Add knowledge about arm hf dynamic loader eglibc: Add ARM hf dynamic linker support gcc: Grok for callconvention-hard to enable hard float Marko Lindqvist (1): package_deb.bbclass: don't handle advanced dependency marker as version number Nitin A Kamble (1): eglibc: package mtrace separately Paul Eggleton (1): classes/base: add checksum file list at parse time Robert Yang (2): package_rpm.bbclass: Fix incremental rpm image generation rpm 5.4.0: respect to the arch when choose the alternatives Xiaofeng Yan (1): ncurses: Avoid occasional builling failure when having parallel processable task meta/classes/base.bbclass |1 + meta/classes/distutils.bbclass |4 - meta/classes/package_deb.bbclass | 19 +- meta/classes/package_rpm.bbclass | 20 +- meta/classes/sanity.bbclass| 157 +- meta/conf/distro/include/tcmode-external-csl.inc | 119 +--- .../distro/include/tcmode-external-sourcery.inc| 118 +++ meta/conf/machine/qemumips64.conf | 13 + meta/conf/machine/qemush4.conf | 13 + .../libnss-mdns/libnss-mdns_0.10.bb| 15 +- .../makefile-remove-hard-usr-reference.patch | 16 + meta/recipes-connectivity/ppp/ppp_2.4.5.bb |2 +- .../wpa-supplicant/wpa-supplicant-0.7.inc |2 +- .../wpa-supplicant/wpa-supplicant_0.7.3.bb |2 +- .../eglibc/eglibc-2.15/add_HAVE_ARM_PCS_VFP.patch | 28 ++ .../eglibc/eglibc-2.15/ldso_arm_hf_support.patch | 338 meta/recipes-core/eglibc/eglibc-package.inc|7 +- meta/recipes-core/eglibc/eglibc_2.13.bb|2 +- meta/recipes-core/eglibc/eglibc_2.15.bb|4 +- ...toolchain.bb = external-sourcery-toolchain.bb} |6 + .../SUPPORTED |0 meta/recipes-core/ncurses/ncurses.inc | 23 +- meta/recipes-core/netbase/netbase-4.47/init| 101 -- meta/recipes-core/netbase/netbase_4.47.bb |2 +- meta/recipes-core/tasks/task-core-tools-debug.bb |4 + meta/recipes-devtools/gcc/gcc-4.7.inc |1 + .../gcc/gcc-4.7/arm-hard-float-loader.patch| 48 +++ meta/recipes-devtools/gcc/gcc-common.inc |2 + meta/recipes-devtools/libtool/libtool-2.4.2.inc|3 +- .../python/python-argparse_1.2.1.bb|2 +- .../python/python-imaging_1.1.7.bb |2 +- .../python/python-pycurl_7.19.0.bb |2 +- meta/recipes-devtools/python/python-pyrex_0.9.9.bb |2 +- meta/recipes-devtools/python/python-scons_2.1.0.bb |2 +- .../python/python-setuptools_0.6c11.bb |2 +-
[OE-core] [Consolidated Pull 09/28] classes/base: add checksum file list at parse time
From: Paul Eggleton paul.eggle...@linux.intel.com
Connect the new fetcher file checksum code so that we get a list of the
files to be checksummed at parse time.
The file-checksums flag will not be read unless we are using a version
of BitBake that supports the function we call within it, so it is safe
to include this change even when the metadata will still be used with
older versions of BitBake.
Implements [YOCTO #2044].
Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
---
meta/classes/base.bbclass |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index bb39b7b..79685f7 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -77,6 +77,7 @@ THISDIR = ${@os.path.dirname(d.getVar('FILE', True))}
addtask fetch
do_fetch[dirs] = ${DL_DIR}
+do_fetch[file-checksums] = ${@bb.fetch.get_checksum_file_list(d)}
python base_do_fetch() {
src_uri = (d.getVar('SRC_URI', True) or ).split()
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 11/28] package_rpm.bbclass: Fix incremental rpm image generation
From: Robert Yang liezhi.y...@windriver.com
Fix the incremental rpm image generation, it didn't work since the code
has been changed.
The btmanifest should have a .manifest suffix, so that it can be moved
to ${T} by rootfs_rpm.bbclass:
mv ${IMAGE_ROOTFS}/install/*.manifest ${T}/
Note: The locale pkgs would always be re-installed.
[YOCTO #2440]
Signed-off-by: Robert Yang liezhi.y...@windriver.com
---
meta/classes/package_rpm.bbclass | 20
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 2da7a8b..daa9db4 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -158,28 +158,24 @@ rpm_common_comand () {
rpm_update_pkg () {
manifest=$1
-btmanifest=$manifest.bt
+btmanifest=$manifest.bt.manifest
+pre_btmanifest=${T}/${btmanifest##/*/}
local target_rootfs=${INSTALL_ROOTFS_RPM}
# Save the rpm's build time for incremental image generation, and the file
# would be moved to ${T}
-rm -f $btmanifest
for i in `cat $manifest`; do
# Use rpm rather than ${RPM} here, since we don't need the
# '--dbpath' option
-echo $i `rpm -qp --qf '%{BUILDTIME}\n' $i` $btmanifest
-done
+echo $i `rpm -qp --qf '%{BUILDTIME}\n' $i`
+done | sort -u $btmanifest
# Only install the different pkgs if incremental image generation is set
-if [ ${INC_RPM_IMAGE_GEN} = 1 -a -f ${T}/total_solution_bt.manifest -a
\
+if [ ${INC_RPM_IMAGE_GEN} = 1 -a -f $pre_btmanifest -a \
${IMAGE_PKGTYPE} = rpm ]; then
-cur_list=$btmanifest
-pre_list=${T}/total_solution_bt.manifest
-sort -u $cur_list -o $cur_list
-sort -u $pre_list -o $pre_list
-comm -1 -3 $cur_list $pre_list | sed 's#.*/\(.*\)\.rpm .*#\1#' \
+comm -1 -3 $btmanifest $pre_btmanifest | sed 's#.*/\(.*\)\.rpm .*#\1#'
\
${target_rootfs}/install/remove.manifest
-comm -2 -3 $cur_list $pre_list | awk '{print $1}' \
+comm -2 -3 $btmanifest $pre_btmanifest | awk '{print $1}' \
${target_rootfs}/install/incremental.manifest
# Attempt to remove unwanted pkgs, the scripts(pre, post, etc.) has not
@@ -462,7 +458,7 @@ EOF
# probably a feature. The only way to convince rpm to actually run the
preinstall scripts
# for base-passwd and shadow first before installing packages that
depend on these packages
# is to do two image installs, installing one set of packages, then the
other.
- if [ ${INC_RPM_IMAGE_GEN} = 1 -a -f ${T}/total_solution_bt.manifest
]; then
+ if [ ${INC_RPM_IMAGE_GEN} = 1 -a -f $pre_btmanifest ]; then
echo Skipping pre install due to exisitng image
else
echo # Initial Install manifest
${target_rootfs}/install/initial_install.manifest
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 10/28] package_deb.bbclass: don't handle advanced dependency marker as version number
From: Marko Lindqvist cazf...@gmail.com
Strip advanced dependency markers away from Provides before writing
them to control file. Left in place they would mean package version
number in control file format.
Signed-off-by: Marko Lindqvist cazf...@gmail.com
---
meta/classes/package_deb.bbclass | 19 ++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 4096fa2..2e0ea92 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -206,6 +206,23 @@ python do_package_deb () {
import re, copy
import textwrap
+def deb_explode_dep_ver(varname):
+# Remove markers from string so they won't get handled as version
numbers
+depstr = localdata.getVar(varname, True) or
+start = depstr.find(()
+while start != -1:
+# We are not searching ) from full string in case it's malformed
in a way
+# that first ) is before first (
+endstr = depstr[start:len(depstr)]
+end = endstr.find())
+if (end == len(endstr) - 1) or (end == -1):
+tmpstr = depstr[0:start]
+else:
+tmpstr = depstr[0:start] + depstr[start+end+1:len(depstr)]
+depstr = tmpstr
+start = depstr.find(()
+return bb.utils.explode_dep_versions(depstr)
+
workdir = d.getVar('WORKDIR', True)
if not workdir:
bb.error(WORKDIR not defined, unable to package)
@@ -341,7 +358,7 @@ python do_package_deb () {
if '*' in dep:
del rrecommends[dep]
rsuggests =
bb.utils.explode_dep_versions(localdata.getVar(RSUGGESTS, True) or )
-rprovides =
bb.utils.explode_dep_versions(localdata.getVar(RPROVIDES, True) or )
+rprovides = deb_explode_dep_ver(RPROVIDES)
rreplaces =
bb.utils.explode_dep_versions(localdata.getVar(RREPLACES, True) or )
rconflicts =
bb.utils.explode_dep_versions(localdata.getVar(RCONFLICTS, True) or )
if rdepends:
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 12/28] rpm 5.4.0: respect to the arch when choose the alternatives
From: Robert Yang liezhi.y...@windriver.com
There is a bug if we:
1) bitbake diffutils with MACHINE=crownbay
2) bitbake diffutils with MACHINE=qemux86
3) bitbake core-image-sato with MACHINE=crownbay
Then the diffutils.i586 would be installed to the crownbay's image, this
is because diffutils.i586 is newer than diffutils.core2, and rpm doesn't
respect to the arch priorities:
We have put the archs in order in _solve_dbpath:
crownbay/solvedb:core2/solvedb:i586/solvedb:all/solvedb
Fix rpm to respect to the order, for example, if it finds a pkg in both
core2/ and i586/, and the core2/ comes first, it should not use the one
in i586/ even if it's build time is newer.
Note: Don't worry about the _free(*ptr), it can check whether ptr is
NULL or not.
This is for the denzil branch, and the master branch also needs it.
[YOCTO #2360]
Signed-off-by: Robert Yang liezhi.y...@windriver.com
---
.../rpm/rpm/rpm-respect-arch.patch | 67
meta/recipes-devtools/rpm/rpm_5.4.0.bb |3 +-
2 files changed, 69 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
b/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
new file mode 100644
index 000..9b63b37
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
@@ -0,0 +1,67 @@
+rpmts.c: respect to the arch priorities
+
+Let rpm respect to the priorities when choose alternatives rpm, the arch
+which comes first is preferred.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang liezhi.y...@windriver.com
+---
+ lib/rpmts.c | 14 ++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/lib/rpmts.c b/lib/rpmts.c
+index 3fbbc9e..40ec08e 100644
+--- a/lib/rpmts.c
b/lib/rpmts.c
+@@ -353,6 +353,7 @@ int rpmtsSolve(rpmts ts, rpmds ds, /*@unused@*/ const void
* data)
+ Header h = NULL;
+ size_t bhnamelen = 0;
+ time_t bhtime = 0;
++const char *bharch = NULL;
+ rpmTag rpmtag;
+ const char * keyp;
+ size_t keylen = 0;
+@@ -409,6 +410,7 @@ fprintf(stderr, -- %s(%p,%p,%p)\n, __FUNCTION__, ts,
ds, data);
+ while ((h = rpmmiNext(mi)) != NULL) {
+ size_t hnamelen;
+ time_t htime;
++ const char *harch = NULL;
+
+ if (rpmtag == RPMTAG_PROVIDENAME !rpmdsAnyMatchesDep(h, ds, 1))
+ continue;
+@@ -431,12 +433,23 @@ fprintf(stderr, -- %s(%p,%p,%p)\n, __FUNCTION__, ts,
ds, data);
+ if (htime = bhtime)
+ continue;
+
++ /* XXX Respect to the arch priorities */
++ he-tag = RPMTAG_ARCH;
++ xx = headerGet(h, he, 0);
++ harch = ((xx he-p.str) ? xstrdup(he-p.str) : NULL);
++ he-p.ptr = _free(he-p.ptr);
++ if (bharch (strcmp(bharch, harch) != 0))
++ continue;
++
+ /* Save new best candidate. */
+ (void)headerFree(bh);
+ bh = NULL;
+ bh = headerLink(h);
+ bhtime = htime;
+ bhnamelen = hnamelen;
++ bharch = _free(bharch);
++ bharch = xstrdup(harch);
++ harch = _free(harch);
+ }
+ mi = rpmmiFree(mi);
+
+@@ -449,6 +462,7 @@ fprintf(stderr, -- %s(%p,%p,%p)\n, __FUNCTION__, ts,
ds, data);
+ } while (1);
+
+ }
++bharch = _free(bharch);
+
+ /* Is there a suggested resolution? */
+ if (bh == NULL)
+--
+1.7.1
+
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 5ee6b47..d79d199 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM =
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1
DEPENDS = bzip2 zlib db openssl elfutils expat libpcre attr acl popt
${extrarpmdeps}
extrarpmdeps = python perl file
extrarpmdeps_virtclass-native = python-native file-native
-PR = r36
+PR = r37
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -70,6 +70,7 @@ SRC_URI =
http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
file://pythondeps.sh \
file://rpmdeps-oecore.patch \
file://rpm-resolvedep.patch \
+ file://rpm-respect-arch.patch \
# file://rpm-autoconf.patch \
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 14/28] ncurses: Avoid occasional builling failure when having parallel processable task
From: Xiaofeng Yan xiaofeng@windriver.com
ncurses failure non-gplv3 build (race issue) like the following \
error information:
| tic: error while loading shared libraries: /srv/home/pokybuild \
/yocto-autobuilder/yocto-slave/nightly-non-gpl3/build/build/tmp/\
work/x86_64-linux/ncurses-native-5.9-r8.1/ncurses-5.9/narrowc/lib\
/libtinfo.so.5: file too short
| ? tic could not build /srv/home/pokybuild/yocto-autobuilder/\
yocto-slave/nightly-non-gpl3/build/build/tmp/work/x86_64-linux/\
ncurses-native-5.9-r8.1/image/srv/home/pokybuild/yocto-autobuilder\
/yocto-slave/nightly-non-gpl3/build/build/tmp/sysroots/x86_64-linux\
/usr/share/terminfo
| make[1]: *** [install.data] Error 1
This is a race issue which is caused by
install.libs and install.data:
1) install.data needs run tic
2) tic needs libtinfo.so
3) install.libs would regenerate libtinfo.so
4) but install.data doesn't depend on install.libs, and they can run
parallelly
So there would be errors in a very critical condition: tic is begining
to run at the same time when install.libs is generating libtinfo.so, and
this libtinfo.so is not integrity, then there would be the above error.
Let task install.libs run before install.data for fixing this bug.
[YOCTO #2298]
Signed-off-by: Xiaofeng Yan xiaofeng@windriver.com
---
meta/recipes-core/ncurses/ncurses.inc | 23 ++-
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/ncurses/ncurses.inc
b/meta/recipes-core/ncurses/ncurses.inc
index ae99e2c..b031119 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM =
file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
SECTION = libs
DEPENDS = ncurses-native
DEPENDS_virtclass-native =
-INC_PR = r8
+INC_PR = r9
inherit autotools binconfig multilib_header
@@ -107,10 +107,15 @@ do_test() {
diff curses-narrowc.h curses-widec.h
}
+# Split original _install_opts to two parts.
+# One is the options to install contents, the other is the parameters \
+# when running command make install
_install_opts = \
+ install.libs install.includes install.man \
+
+_install_cfgs = \
DESTDIR='${D}' \
PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
- install.libs install.includes install.man \
python do_install () {
@@ -122,11 +127,19 @@ shell_do_install() {
# Order of installation is important; widec installs a 'curses.h'
# header with more definitions and must be installed last hence.
# Compatibility of these headers will be checked in 'do_test()'.
-oe_runmake -C narrowc ${_install_opts} \
-install.data install.progs
+oe_runmake -C narrowc ${_install_cfgs} ${_install_opts} \
+install.progs
+
+# The install.data should run after install.libs, otherwise
+# there would be a race issue in a very critical conditon, since
+# tic will be run by install.data, and tic needs libtinfo.so
+# which would be regenerated by install.libs.
+oe_runmake -C narrowc ${_install_cfgs} \
+install.data
+
! ${ENABLE_WIDEC} || \
-oe_runmake -C widec ${_install_opts}
+oe_runmake -C widec ${_install_cfgs} ${_install_opts}
cd narrowc
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 15/28] libtool: fixed parallel build related race
From: Enrico Scholz enrico.sch...@sigma-chemnitz.de
While building libtool, the libtool script itself will be regenerated
because OE modifies a dependency[1]. With -jX, this operation (--
removal, creation of non-x file, 'chmod a+x') can happen at a time when
the script is going to be executed. This can cause errors like:
| arm-linux-gnueabi-libtool: compile: ccache arm-linux-gnueabi-gcc ...
| ...
| /bin/sh ./config.status libtool
| ...
| arm-linux-gnueabi-libtool: compile: ccache arm-linux-gnueabi-gcc ...
| /bin/sh: ./arm-linux-gnueabi-libtool: Permission denied
| make[2]: *** [libltdl/libltdl_libltdl_la-lt__alloc.lo] Error 126
I am not sure whether the custom do_compile_prepend() is still needed.
For now only the issue above will be fixed by executing ./config.status
yet again.
[1] see 648290d5bf4d6ff50d3643bb7ad902dfc23aa702
Signed-off-by: Enrico Scholz enrico.sch...@sigma-chemnitz.de
---
meta/recipes-devtools/libtool/libtool-2.4.2.inc |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index 084062a..c1ef7c4 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -8,7 +8,7 @@ LICENSE = GPLv2 LGPLv2.1
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06
-INC_PR = r2
+INC_PR = r3
SRC_URI = ${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://trailingslash.patch \
@@ -27,6 +27,7 @@ do_compile_prepend () {
# Sometimes this file doesn't get rebuilt, force the issue
rm -f ${S}/libltdl/config/ltmain.sh
make libltdl/config/ltmain.sh
+ ./config.status
}
inherit autotools
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 13/28] eglibc: package mtrace separately
From: Nitin A Kamble nitin.a.kam...@intel.com
add libc-mtrace as dependency for task-core-tools-debug
now eglibc-mtrace gets included in an sdk image and not in a non-sdk image.
This does not affect builds with uclibc.
This fixes bug: [YOCTO# 2374]
Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com
---
meta/recipes-core/eglibc/eglibc-package.inc |7 ++-
meta/recipes-core/eglibc/eglibc_2.13.bb |2 +-
meta/recipes-core/tasks/task-core-tools-debug.bb |4
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc
b/meta/recipes-core/eglibc/eglibc-package.inc
index 7d97567..ce37155 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -20,11 +20,12 @@ USE_LDCONFIG ?= 1
PKGSUFFIX =
PKGSUFFIX_virtclass-nativesdk = -nativesdk
-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}-staticdev ${PN}-doc
libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX}
${PN}-pcprofile libsotruss${PKGSUFFIX}
+PACKAGES = ${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX}
nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-mtrace ${PN}-utils
eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev
${PN}-staticdev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX}
libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}
# The ld.so in this eglibc supports the GNU_HASH
RPROVIDES_${PN} = glibc${PKGSUFFIX} rtld(GNU_HASH)
RPROVIDES_${PN}-utils = glibc${PKGSUFFIX}-utils
+RPROVIDES_${PN}-mtrace = glibc${PKGSUFFIX}-mtrace libc-mtrace
RPROVIDES_${PN}-pic = glibc${PKGSUFFIX}-pic
RPROVIDES_${PN}-dev = glibc${PKGSUFFIX}-dev
RPROVIDES_${PN}-staticdev = glibc${PKGSUFFIX}-staticdev
@@ -48,11 +49,13 @@ FILES_${PN}-dev_append += ${bindir}/rpcgen
${libdir}/*_nonshared.a \
${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal
FILES_${PN}-staticdev_append += ${libdir}/*.a ${base_libdir}/*.a
FILES_nscd${PKGSUFFIX} = ${sbindir}/nscd*
+FILES_${PN}-mtrace = ${bindir}/mtrace
FILES_${PN}-utils = ${bindir}/* ${sbindir}/*
FILES_${PN}-dbg += ${libexecdir}/*/.debug ${libdir}/audit/.debug
FILES_catchsegv${PKGSUFFIX} = ${bindir}/catchsegv
RDEPENDS_catchsegv${PKGSUFFIX} = libsegfault
RDEPENDS_${PN}-utils += bash
+RDEPENDS_${PN}-mtrace += perl
FILES_${PN}-pcprofile = ${base_libdir}/libpcprofile.so
FILES_eglibc-thread-db${PKGSUFFIX} = ${base_libdir}/libthread_db.so.*
${base_libdir}/libthread_db-*.so
RPROVIDES_${PN}-dev += libc-dev
@@ -68,6 +71,8 @@ SUMMARY_ldd = print shared library dependencies
DESCRIPTION_ldd = /usr/bin/ldd prints shared library dependencies for each
program or shared library specified on the command line.
SUMMARY_${PN}-utils = Miscellaneous utilities provided by eglibc
DESCRIPTION_${PN}-utils = Miscellaneous utilities including getconf, iconf,
locale, gencat, tzselect, zic, rpcinfo, ...
+SUMMARY_${PN}-mtrace = mtrace utility provided by eglibc
+DESCRIPTION_${PN}-mtrace = mtrace utility provided by eglibc
DESCRIPTION_libsotruss = Library to support sotruss which traces calls
through PLTs
inherit libc-common multilib_header
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb
b/meta/recipes-core/eglibc/eglibc_2.13.bb
index d8a41dc..73cd0aa 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = 15508
DEPENDS += gperf-native
-PR = r26
+PR = r27
PR_append = +svnr${SRCPV}
EGLIBC_BRANCH=eglibc-2_13
diff --git a/meta/recipes-core/tasks/task-core-tools-debug.bb
b/meta/recipes-core/tasks/task-core-tools-debug.bb
index 3c92f3f..1dddbb8 100644
--- a/meta/recipes-core/tasks/task-core-tools-debug.bb
+++ b/meta/recipes-core/tasks/task-core-tools-debug.bb
@@ -17,10 +17,14 @@ PACKAGE_ARCH = ${MACHINE_ARCH}
ALLOW_EMPTY = 1
+MTRACE =
+MTRACE_libc-glibc = libc-mtrace
+
RDEPENDS_${PN} = \
gdb \
gdbserver \
tcf-agent \
rsync \
strace \
+${MTRACE} \
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 16/28] ppp: avoid host contamination
From: Andreas Oberritter o...@opendreambox.org
* Import patch from OE-Classic commit f7c547ede1bfc94c24f6315a23ff48a4c5b9ffaf.
* Fixes linking with libpcap (ppp filter).
Signed-off-by: Andreas Oberritter o...@opendreambox.org
---
.../makefile-remove-hard-usr-reference.patch | 16
meta/recipes-connectivity/ppp/ppp_2.4.5.bb |2 +-
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git
a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
index 8cc354a..d59717e 100644
---
a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
+++
b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
@@ -1,6 +1,9 @@
The patch comes from OpenEmbedded.
Rebased for ppp-2.4.5. Dongxiao Xu dongxiao...@intel.com
+Updated from OE-Classic to include the pcap hunk.
+Signed-off-by: Andreas Oberritter o...@opendreambox.org
+
Upstream-Status: Inappropriate [configuration]
diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
@@ -19,3 +22,16 @@ diff -urN ppp-2.4.5-orig/pppd/Makefile.linux
ppp-2.4.5/pppd/Makefile.linux
ifdef NEEDDES
ifndef USE_CRYPT
+@@ -169,10 +169,10 @@
+ endif
+
+ ifdef FILTER
+-ifneq ($(wildcard /usr/include/pcap-bpf.h),)
++#ifneq ($(wildcard /usr/include/pcap-bpf.h),)
+ LIBS+= -lpcap
+ CFLAGS += -DPPP_FILTER
+-endif
++#endif
+ endif
+
+ ifdef HAVE_INET6
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
index ed815d3..587871a 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM =
file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77
file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8
\
file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2
-PR = r4
+PR = r5
SRC_URI = http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
file://makefile.patch \
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 17/28] libnss-mdns: fix postinst scripts
From: Andreas Oberritter o...@opendreambox.org
* On upgrade, postinst ocassionally returned 1, so use a
conditional instead of .
* Use sed patterns in order to make it work more generally.
Signed-off-by: Andreas Oberritter o...@opendreambox.org
---
.../libnss-mdns/libnss-mdns_0.10.bb| 15 +++
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
index 8770714..a1f2f9a 100644
--- a/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
+++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1
DEPENDS = avahi
RDEPENDS_${PN} = avahi-daemon
-PR = r4
+PR = r5
SRC_URI = http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz;
@@ -23,15 +23,14 @@ DEBIANNAME_${PN} = libnss-mdns
EXTRA_OECONF = --libdir=${base_libdir} --disable-lynx --enable-avahi
-# TODO: pattern based configuration update
pkg_postinst_${PN} () {
- cat $D/etc/nsswitch.conf | grep hosts:\s*files dns$ /dev/null {
- sed -i 's/hosts:\s*files dns/ mdns4/' $D/etc/nsswitch.conf
- }
+if ! grep -q '^hosts:.*\mdns4\' $D/etc/nsswitch.conf; then
+ sed -e 's/^hosts:.*/ mdns4/' -i $D/etc/nsswitch.conf
+fi
}
pkg_prerm_${PN} () {
- cat /etc/nsswitch.conf | grep hosts:\s*files dns mdns4$ /dev/null
{
- sed -i 's/\(hosts:\s*files dns\) mdns4*/\1/' /etc/nsswitch.conf
- }
+if grep -q '^hosts:.*\mdns4\' /etc/nsswitch.conf; then
+ sed -e '/^hosts:/s/\s\mdns4\//' -i /etc/nsswitch.conf
+fi
}
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 20/28] distutils.bbclass: don't delete .pyo files
From: Andreas Oberritter o...@opendreambox.org
* Deleting .pyo files causes them to get compiled on the target.
* First boot gets *really* slow for python based projects.
* No space gets saved on the target.
* The package manager doesn't know about the files and
therefore fails to uninstall them, occupying space and causing
uninstalled python scripts to remain executable.
* It's inconsistent, because python itself and autotools based
projects already ship .pyo files.
* Probably .pyo files were deleted because .pyc files were
available earlier, but this has changed and OE-Core's python
now only generates optimized .pyo files. Deletion of .pyo was
introduced in 2008, python/04-default-is-optimized.patch
was introduced in 2009.
Signed-off-by: Andreas Oberritter o...@opendreambox.org
---
meta/classes/distutils.bbclass |4
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 18ae805..bcddf8d 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -65,10 +65,6 @@ distutils_do_install() {
if test -e ${D}${datadir}/share; then
mv -f ${D}${datadir}/share/* ${D}${datadir}/
fi
-
-# These are generated files, on really slow systems the storage/speed
trade off
-# might be worth it, but in general it isn't
-find ${D}${libdir}/${PYTHON_DIR}/site-packages -iname '*.pyo' -exec rm
{} \;
}
EXPORT_FUNCTIONS do_compile do_install
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 18/28] wpa-supplicant: fix packaging error since last commit
From: Andreas Oberritter o...@opendreambox.org
* wpa-passphrase has its own package, but commit
4a4c568e25a08e9f222d723f9819582c9f895c58 broke it.
Signed-off-by: Andreas Oberritter o...@opendreambox.org
---
.../wpa-supplicant/wpa-supplicant-0.7.inc |2 +-
.../wpa-supplicant/wpa-supplicant_0.7.3.bb |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
index aabb3df..b489893 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -19,7 +19,7 @@ SRC_URI =
http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
S = ${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant
PACKAGES_prepend = wpa-supplicant-passphrase wpa-supplicant-cli
-FILES_wpa-supplicant-passphrase = ${sbindir}/wpa_passphrase
+FILES_wpa-supplicant-passphrase = ${bindir}/wpa_passphrase
FILES_wpa-supplicant-cli = ${sbindir}/wpa_cli
FILES_${PN} += ${datadir}/dbus-1/system-services/*
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
index dc2eb6c..1e0086a 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
@@ -1,6 +1,6 @@
require wpa-supplicant-0.7.inc
-PR = r9
+PR = r10
SRC_URI[md5sum] = f516f191384a9a546e3f5145c08addda
SRC_URI[sha256sum] =
d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 21/28] python: bump PR of packages after update of distutils.bbclass
From: Andreas Oberritter o...@opendreambox.org
* Bump every recipe inheriting distutils or setuptools and
not overriding do_install without calling distutils_do_install.
Signed-off-by: Andreas Oberritter o...@opendreambox.org
---
.../python/python-argparse_1.2.1.bb|2 +-
.../python/python-imaging_1.1.7.bb |2 +-
.../python/python-pycurl_7.19.0.bb |2 +-
meta/recipes-devtools/python/python-pyrex_0.9.9.bb |2 +-
meta/recipes-devtools/python/python-scons_2.1.0.bb |2 +-
.../python/python-setuptools_0.6c11.bb |2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-devtools/python/python-argparse_1.2.1.bb
b/meta/recipes-devtools/python/python-argparse_1.2.1.bb
index 789cee1..7c15575 100644
--- a/meta/recipes-devtools/python/python-argparse_1.2.1.bb
+++ b/meta/recipes-devtools/python/python-argparse_1.2.1.bb
@@ -3,7 +3,7 @@ SECTION = devel/python
LICENSE = PSF
LIC_FILES_CHKSUM = file://LICENSE.txt;md5=09d08bb5b7047e2688ea3faad6408aa8
SRCNAME = argparse
-PR = r1
+PR = r2
SRC_URI = http://argparse.googlecode.com/files/${SRCNAME}-${PV}.tar.gz;
SRC_URI[md5sum] = 2fbef8cb61e506c706957ab6e135840c
diff --git a/meta/recipes-devtools/python/python-imaging_1.1.7.bb
b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
index 6d9743e..a36c344 100644
--- a/meta/recipes-devtools/python/python-imaging_1.1.7.bb
+++ b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
@@ -4,7 +4,7 @@ LICENSE = MIT
LIC_FILES_CHKSUM =
file://README;beginline=92;endline=120;md5=c4371af4579f1e489cf881c1443dd4ec
DEPENDS = freetype jpeg tiff
SRCNAME = Imaging
-PR = r3
+PR = r4
SRC_URI = http://effbot.org/downloads/Imaging-${PV}.tar.gz \
file://0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
diff --git a/meta/recipes-devtools/python/python-pycurl_7.19.0.bb
b/meta/recipes-devtools/python/python-pycurl_7.19.0.bb
index 8b849d7..122e1bd 100644
--- a/meta/recipes-devtools/python/python-pycurl_7.19.0.bb
+++ b/meta/recipes-devtools/python/python-pycurl_7.19.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
file://README;endline=13;md5=fbfe545b1869617123a08c0983ef17b
DEPENDS = curl python
RDEPENDS_${PN} = python-core curl
SRCNAME = pycurl
-PR = r2
+PR = r3
SRC_URI = \
http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive
\
diff --git a/meta/recipes-devtools/python/python-pyrex_0.9.9.bb
b/meta/recipes-devtools/python/python-pyrex_0.9.9.bb
index 568fb0d..0ae35b0 100644
--- a/meta/recipes-devtools/python/python-pyrex_0.9.9.bb
+++ b/meta/recipes-devtools/python/python-pyrex_0.9.9.bb
@@ -5,7 +5,7 @@ SECTION = devel/python
LICENSE = Apache-2.0
LIC_FILES_CHKSUM = file://LICENSE.txt;md5=771d472f53f933033f577808e5bd
SRCNAME = Pyrex
-PR = r3
+PR = r4
SRC_URI = \
http://www.cosc.canterbury.ac.nz/greg.ewing/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
\
diff --git a/meta/recipes-devtools/python/python-scons_2.1.0.bb
b/meta/recipes-devtools/python/python-scons_2.1.0.bb
index f0b5b1f..8c5aa07 100644
--- a/meta/recipes-devtools/python/python-scons_2.1.0.bb
+++ b/meta/recipes-devtools/python/python-scons_2.1.0.bb
@@ -4,7 +4,7 @@ LICENSE = MIT
LIC_FILES_CHKSUM = file://LICENSE.txt;md5=ab8b65435c2e520ed18e67459f1f9bb9
SRCNAME = scons
-PR = r1
+PR = r2
SRC_URI = ${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz
diff --git a/meta/recipes-devtools/python/python-setuptools_0.6c11.bb
b/meta/recipes-devtools/python/python-setuptools_0.6c11.bb
index 5dd5f31..a769714 100644
--- a/meta/recipes-devtools/python/python-setuptools_0.6c11.bb
+++ b/meta/recipes-devtools/python/python-setuptools_0.6c11.bb
@@ -5,7 +5,7 @@ LICENSE = PSF
LIC_FILES_CHKSUM =
file://setup.py;beginline=23;endline=23;md5=8a314270dd7a8dbca741775415f1716e
SRCNAME = setuptools
-PR = ml3
+PR = ml4
DEPENDS += python
DEPENDS_virtclass-native += python-native
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 19/28] netbase: merge init script updates from upstream
From: Andreas Oberritter o...@opendreambox.org
* Read /proc/mounts only once.
* Support many more network filesystem types.
* Remaining differences to netbase 4.47:
- Uses the mountvirtfs keyword instead of mountkernfs
- Doesn't use lsb functions
- Doesn't print a warning if /etc/network/options exists
- Doesn't use --exclude parameter for ifup, because
busybox doesn't support it.
Signed-off-by: Andreas Oberritter o...@opendreambox.org
---
meta/recipes-core/netbase/netbase-4.47/init | 101 ++-
meta/recipes-core/netbase/netbase_4.47.bb |2 +-
2 files changed, 70 insertions(+), 33 deletions(-)
diff --git a/meta/recipes-core/netbase/netbase-4.47/init
b/meta/recipes-core/netbase/netbase-4.47/init
index 8a67e1c..bace9df 100644
--- a/meta/recipes-core/netbase/netbase-4.47/init
+++ b/meta/recipes-core/netbase/netbase-4.47/init
@@ -1,52 +1,89 @@
-#!/bin/sh
-#
+#!/bin/sh -e
### BEGIN INIT INFO
# Provides: networking
-# Required-Start:$local_fs mountvirtfs
+# Required-Start:mountvirtfs $local_fs
# Required-Stop: $local_fs
+# Should-Start: ifupdown
+# Should-Stop: ifupdown
# Default-Start: S
# Default-Stop: 0 6
-# Short-Description: Raise network interfaces and configure them
+# Short-Description: Raise network interfaces.
### END INIT INFO
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-if ! [ -x /sbin/ifup ]; then
-exit 0
-fi
+[ -x /sbin/ifup ] || exit 0
+
+check_network_file_systems() {
+[ -e /proc/mounts ] || return 0
+
+if [ -e /etc/iscsi/iscsi.initramfs ]; then
+ echo not deconfiguring network interfaces: iSCSI root is mounted.
+ exit 0
+fi
+
+exec 90 /proc/mounts
+while read DEV MTPT FSTYPE REST; do
+ case $DEV in
+ /dev/nbd*|/dev/nd[a-z]*|/dev/etherd/e*)
+ echo not deconfiguring network interfaces: network devices still
mounted.
+ exit 0
+ ;;
+ esac
+ case $FSTYPE in
+
nfs|nfs4|smbfs|ncp|ncpfs|cifs|coda|ocfs2|gfs|pvfs|pvfs2|fuse.httpfs|fuse.curlftpfs)
+ echo not deconfiguring network interfaces: network file systems
still mounted.
+ exit 0
+ ;;
+ esac
+done
+exec 09 9-
+}
+
+check_network_swap() {
+[ -e /proc/swaps ] || return 0
+
+exec 90 /proc/swaps
+while read DEV MTPT FSTYPE REST; do
+ case $DEV in
+ /dev/nbd*|/dev/nd[a-z]*|/dev/etherd/e*)
+ echo not deconfiguring network interfaces: network swap still
mounted.
+ exit 0
+ ;;
+ esac
+done
+exec 09 9-
+}
case $1 in
-start)
-echo -n Configuring network interfaces...
-ifup -a
+start)
+ echo -n Configuring network interfaces...
+ ifup -a
echo done.
;;
-stop)
-if sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\1 \2/p' /proc/mounts |
- grep -q ^/ nfs$; then
-echo NOT deconfiguring network interfaces: / is an NFS mount
-elif sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\1 \2/p' /proc/mounts |
- grep -q ^/ smbfs$; then
-echo NOT deconfiguring network interfaces: / is an SMB mount
- elif sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\2/p' /proc/mounts |
- grep -qE '^(nfs|smbfs|ncp|coda)$'; then
-echo NOT deconfiguring network interfaces: network shares still
mounted.
-else
-echo -n Deconfiguring network interfaces...
-ifdown -a
- echo done.
-fi
+
+stop)
+ check_network_file_systems
+ check_network_swap
+
+ echo -n Deconfiguring network interfaces...
+ ifdown -a
+ echo done.
;;
-force-reload|restart)
-echo -n Reconfiguring network interfaces...
-ifdown -a
-ifup -a
+
+force-reload|restart)
+ echo Running $0 $1 is deprecated because it may not enable again some
interfaces
+ echo Reconfiguring network interfaces...
+ ifdown -a || true
+ ifup -a
echo done.
;;
-*)
- echo Usage: /etc/init.d/networking {start|stop|restart|force-reload}
+
+*)
+ echo Usage: /etc/init.d/networking {start|stop}
exit 1
;;
esac
exit 0
+
diff --git a/meta/recipes-core/netbase/netbase_4.47.bb
b/meta/recipes-core/netbase/netbase_4.47.bb
index 1c85997..634560a 100644
--- a/meta/recipes-core/netbase/netbase_4.47.bb
+++ b/meta/recipes-core/netbase/netbase_4.47.bb
@@ -4,7 +4,7 @@ HOMEPAGE = http://packages.debian.org/netbase;
SECTION = base
LICENSE = GPLv2
LIC_FILES_CHKSUM =
file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab
-PR = r2
+PR = r3
inherit update-rc.d
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 22/28] Revert sanity.bbclass: check user can read and write to SSTATE_DIR
From: Joshua Lock j...@linux.intel.com This has caused problems for several users, including the Yocto Project autobuilder. Since the message was added in order to be more user friendly revert the change. This reverts commit 0c0c4efbf92bcf0f8942f17c18525a4b4ed1798c. --- meta/classes/sanity.bbclass | 17 +++-- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index ff3c413..05545f4 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -96,16 +96,10 @@ def check_conf_exists(fn, data): def check_sanity_sstate_dir_change(sstate_dir, data): # Sanity checks to be done when the value of SSTATE_DIR changes +# Check that SSTATE_DIR isn't on a filesystem with limited filename length (eg. eCryptFS) testmsg = if sstate_dir != : -# Check that the user can read and write to SSTATE_DIR -sstatemsg = check_can_read_write_directory(sstate_dir) or None -if sstatemsg: -sstatemsg = sstatemsg + . You could try using it as an SSTATE_MIRRORS instead of SSTATE_CACHE.\n -testmsg = testmsg + sstatemsg -# Check that SSTATE_DIR isn't on a filesystem with limited filename length (eg. eCryptFS) -testmsg = testmsg + check_create_long_filename(sstate_dir, SSTATE_DIR) - +testmsg = check_create_long_filename(sstate_dir, SSTATE_DIR) return testmsg def check_sanity_tmpdir_change(tmpdir, data): @@ -156,12 +150,7 @@ def check_create_long_filename(filepath, pathname): if errno == 36: # ENAMETOOLONG return Failed to create a file with a long name in %s. Please use a filesystem that does not unreasonably limit filename length.\n % pathname else: -return Failed to create a file in %s: %s\n % (pathname, strerror) -return - -def check_can_read_write_directory(directory): -if not os.access(directory, os.R_OK|os.W_OK): - return Insufficient permissions for %s % directory +return Failed to create a file in %s: %s % (pathname, strerror) return def check_connectivity(d): -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [Consolidated Pull 23/28] sanity.bbclass: copy the data store and finalise before running checks
From: Joshua Lock j...@linux.intel.com
At the ConfigParsed event the datastore has yet to be finalised and thus
appends and overrides have not been set.
To ensure the sanity check is being run against the configuration values
the user has set call finalize() on a copy of the datastore and pass that
for all sanity checks.
Signed-off-by: Joshua Lock j...@linux.intel.com
---
meta/classes/sanity.bbclass | 129 +++
1 files changed, 69 insertions(+), 60 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 05545f4..5361f1f 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -182,8 +182,8 @@ def check_connectivity(d):
return retval
-def check_supported_distro(e):
-tested_distros = e.data.getVar('SANITY_TESTED_DISTROS', True)
+def check_supported_distro(sanity_data):
+tested_distros = sanity_data.getVar('SANITY_TESTED_DISTROS', True)
if not tested_distros:
return
@@ -230,26 +230,26 @@ def check_supported_distro(e):
bb.warn('Host distribution could not be determined; you may possibly
experience unexpected failures. It is recommended that you use a tested
distribution.')
# Checks we should only make if MACHINE is set correctly
-def check_sanity_validmachine(e):
+def check_sanity_validmachine(sanity_data):
from bb import data
messages =
# Check TUNE_ARCH is set
-if data.getVar('TUNE_ARCH', e.data, True) == 'INVALID':
+if data.getVar('TUNE_ARCH', sanity_data, True) == 'INVALID':
messages = messages + 'TUNE_ARCH is unset. Please ensure your MACHINE
configuration includes a valid tune configuration file which will set this
correctly.\n'
# Check TARGET_ARCH is set correctly
-if data.getVar('TARGE_ARCH', e.data, False) == '${TUNE_ARCH}':
+if data.getVar('TARGE_ARCH', sanity_data, False) == '${TUNE_ARCH}':
messages = messages + 'TARGET_ARCH is being overwritten, likely by
your MACHINE configuration files.\nPlease use a valid tune configuration file
which should set this correctly automatically\nand avoid setting this in the
machine configuration. See the OE-Core mailing list for more information.\n'
# Check TARGET_OS is set
-if data.getVar('TARGET_OS', e.data, True) == 'INVALID':
+if data.getVar('TARGET_OS', sanity_data, True) == 'INVALID':
messages = messages + 'Please set TARGET_OS directly, or choose a
MACHINE or DISTRO that does so.\n'
# Check that we don't have duplicate entries in PACKAGE_ARCHS that
TUNE_PKGARCH is in PACKAGE_ARCHS
-pkgarchs = data.getVar('PACKAGE_ARCHS', e.data, True)
-tunepkg = data.getVar('TUNE_PKGARCH', e.data, True)
+pkgarchs = data.getVar('PACKAGE_ARCHS', sanity_data, True)
+tunepkg = data.getVar('TUNE_PKGARCH', sanity_data, True)
tunefound = False
seen = {}
dups = []
@@ -271,7 +271,7 @@ def check_sanity_validmachine(e):
return messages
-def check_sanity(e):
+def check_sanity(sanity_data):
from bb import note, error, data, __version__
try:
@@ -281,7 +281,7 @@ def check_sanity(e):
import commands
# Check the bitbake version meets minimum requirements
-minversion = data.getVar('BB_MIN_VERSION', e.data , True)
+minversion = data.getVar('BB_MIN_VERSION', sanity_data , True)
if not minversion:
# Hack: BB_MIN_VERSION hasn't been parsed yet so return
# and wait for the next call
@@ -303,42 +303,42 @@ def check_sanity(e):
messages = messages + 'Bitbake version %s is required and version %s
was found\n' % (minversion, __version__)
# Check that the MACHINE is valid, if it is set
-if data.getVar('MACHINE', e.data, True):
-if not check_conf_exists(conf/machine/${MACHINE}.conf, e.data):
+if data.getVar('MACHINE', sanity_data, True):
+if not check_conf_exists(conf/machine/${MACHINE}.conf, sanity_data):
messages = messages + 'Please set a valid MACHINE in your
local.conf or environment\n'
else:
-messages = messages + check_sanity_validmachine(e)
+messages = messages + check_sanity_validmachine(sanity_data)
else:
messages = messages + 'Please set a MACHINE in your local.conf or
environment\n'
# Check we are using a valid lacal.conf
-current_conf = data.getVar('CONF_VERSION', e.data, True)
-conf_version = data.getVar('LOCALCONF_VERSION', e.data, True)
+current_conf = data.getVar('CONF_VERSION', sanity_data, True)
+conf_version = data.getVar('LOCALCONF_VERSION', sanity_data, True)
if current_conf != conf_version:
messages = messages + Your version of local.conf was generated from
an older version of local.conf.sample and there have been updates made to this
file. Please compare the two files and merge any changes before
continuing.\nMatching the version numbers will remove this message.\n\meld
conf/local.conf
[OE-core] [Consolidated Pull 24/28] sanity.bbclass: data.getVar(VAR, obj, exp) - obj.getVar(VAR, exp)
From: Joshua Lock j...@linux.intel.com
Replace calls to data.getVar(VARIABLE, data_object, expand) to
direct calls to the getVar method the the data_object.
Signed-off-by: Joshua Lock j...@linux.intel.com
---
meta/classes/sanity.bbclass | 60 +-
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 5361f1f..5cf9ea13 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -236,20 +236,20 @@ def check_sanity_validmachine(sanity_data):
messages =
# Check TUNE_ARCH is set
-if data.getVar('TUNE_ARCH', sanity_data, True) == 'INVALID':
+if sanity_data.getVar('TUNE_ARCH', True) == 'INVALID':
messages = messages + 'TUNE_ARCH is unset. Please ensure your MACHINE
configuration includes a valid tune configuration file which will set this
correctly.\n'
# Check TARGET_ARCH is set correctly
-if data.getVar('TARGE_ARCH', sanity_data, False) == '${TUNE_ARCH}':
+if sanity_data.getVar('TARGE_ARCH', False) == '${TUNE_ARCH}':
messages = messages + 'TARGET_ARCH is being overwritten, likely by
your MACHINE configuration files.\nPlease use a valid tune configuration file
which should set this correctly automatically\nand avoid setting this in the
machine configuration. See the OE-Core mailing list for more information.\n'
# Check TARGET_OS is set
-if data.getVar('TARGET_OS', sanity_data, True) == 'INVALID':
+if sanity_data.getVar('TARGET_OS', True) == 'INVALID':
messages = messages + 'Please set TARGET_OS directly, or choose a
MACHINE or DISTRO that does so.\n'
# Check that we don't have duplicate entries in PACKAGE_ARCHS that
TUNE_PKGARCH is in PACKAGE_ARCHS
-pkgarchs = data.getVar('PACKAGE_ARCHS', sanity_data, True)
-tunepkg = data.getVar('TUNE_PKGARCH', sanity_data, True)
+pkgarchs = sanity_data.getVar('PACKAGE_ARCHS', True)
+tunepkg = sanity_data.getVar('TUNE_PKGARCH', True)
tunefound = False
seen = {}
dups = []
@@ -281,7 +281,7 @@ def check_sanity(sanity_data):
import commands
# Check the bitbake version meets minimum requirements
-minversion = data.getVar('BB_MIN_VERSION', sanity_data , True)
+minversion = sanity_data.getVar('BB_MIN_VERSION', True)
if not minversion:
# Hack: BB_MIN_VERSION hasn't been parsed yet so return
# and wait for the next call
@@ -303,7 +303,7 @@ def check_sanity(sanity_data):
messages = messages + 'Bitbake version %s is required and version %s
was found\n' % (minversion, __version__)
# Check that the MACHINE is valid, if it is set
-if data.getVar('MACHINE', sanity_data, True):
+if sanity_data.getVar('MACHINE', True):
if not check_conf_exists(conf/machine/${MACHINE}.conf, sanity_data):
messages = messages + 'Please set a valid MACHINE in your
local.conf or environment\n'
else:
@@ -312,33 +312,33 @@ def check_sanity(sanity_data):
messages = messages + 'Please set a MACHINE in your local.conf or
environment\n'
# Check we are using a valid lacal.conf
-current_conf = data.getVar('CONF_VERSION', sanity_data, True)
-conf_version = data.getVar('LOCALCONF_VERSION', sanity_data, True)
+current_conf = sanity_data.getVar('CONF_VERSION', True)
+conf_version = sanity_data.getVar('LOCALCONF_VERSION', True)
if current_conf != conf_version:
messages = messages + Your version of local.conf was generated from
an older version of local.conf.sample and there have been updates made to this
file. Please compare the two files and merge any changes before
continuing.\nMatching the version numbers will remove this message.\n\meld
conf/local.conf conf/local.conf.sample\ is a good way to visualise the
changes.\n
# Check bblayers.conf is valid
-current_lconf = data.getVar('LCONF_VERSION', sanity_data, True)
-lconf_version = data.getVar('LAYER_CONF_VERSION', sanity_data, True)
+current_lconf = sanity_data.getVar('LCONF_VERSION', True)
+lconf_version = sanity_data.getVar('LAYER_CONF_VERSION', True)
if current_lconf != lconf_version:
messages = messages + Your version of bblayers.conf was generated
from an older version of bblayers.conf.sample and there have been updates made
to this file. Please compare the two files and merge any changes before
continuing.\nMatching the version numbers will remove this message.\n\meld
conf/bblayers.conf conf/bblayers.conf.sample\ is a good way to visualise the
changes.\n
# If we have a site.conf, check it's valid
if check_conf_exists(conf/site.conf, sanity_data):
-current_sconf = data.getVar('SCONF_VERSION', sanity_data, True)
-sconf_version = data.getVar('SITE_CONF_VERSION', sanity_data, True)
+current_sconf = sanity_data.getVar('SCONF_VERSION', True)
+sconf_version =
[OE-core] [Consolidated Pull 26/28] sanity.bbclass: add extra information when SSTATE_CACHE unusable
From: Joshua Lock j...@linux.intel.com
If the user does not have write permissions to SSTATE_CACHE, detected by
the check_create_long_filename() test failing with a Permission denied
value in strerror, then suggest they might want to use the location as
an entry in SSTATE_MIRRORS.
Signed-off-by: Joshua Lock j...@linux.intel.com
---
meta/classes/sanity.bbclass |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 39da14b..25ddfea 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -100,6 +100,13 @@ def check_sanity_sstate_dir_change(sstate_dir, data):
testmsg =
if sstate_dir != :
testmsg = check_create_long_filename(sstate_dir, SSTATE_DIR)
+# If we don't have permissions to SSTATE_DIR, suggest the user set it
as an SSTATE_MIRRORS
+try:
+err = testmsg.split(': ')[1].strip()
+if err == Permission denied.:
+testmsg = testmsg + You could try using %s in SSTATE_MIRRORS
rather than as an SSTATE_CACHE.\n % (sstate_dir)
+except IndexError:
+pass
return testmsg
def check_sanity_tmpdir_change(tmpdir, data):
--
1.7.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
