[OE-core] [PATCH] apt-native: fix checksums
Signed-off-by: Constantin Musca constantinx.mu...@intel.com --- meta/recipes-devtools/apt/apt-native_0.9.7.7.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/apt/apt-native_0.9.7.7.bb b/meta/recipes-devtools/apt/apt-native_0.9.7.7.bb index 1e420a4..d71ab2f 100644 --- a/meta/recipes-devtools/apt/apt-native_0.9.7.7.bb +++ b/meta/recipes-devtools/apt/apt-native_0.9.7.7.bb @@ -1,11 +1,11 @@ require apt-native.inc -PR = r0 +PR = r1 SRC_URI += file://noconfigure.patch \ file://no-curl.patch -SRC_URI[md5sum] = 3f86f4eff53c94b7f285b3c59eb89754 -SRC_URI[sha256sum] = 71fc7ff15fda50f16c9d73f701adf3bd67c9803a2304cd3d82cb490d76d3c3b3 +SRC_URI[md5sum] = 039fc57668d1a0c2f62dc22e71900a16 +SRC_URI[sha256sum] = 6eca4285f1ac2e8cb837b9546553b0546881ed15853aa5bbeb860bab6bfa1700 LIC_FILES_CHKSUM = file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3 -- 1.7.11.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] package_deb.bbclass: set DPKG_ARCH_arm to armel
- the system should be using armel by default, not arm
[YOCTO #3741]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/classes/package_deb.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 2f27800..3174184 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -7,6 +7,7 @@ inherit package
IMAGE_PKGTYPE ?= deb
DPKG_ARCH ?= ${TARGET_ARCH}
+DPKG_ARCH_arm ?= armel
PKGWRITEDIRDEB = ${WORKDIR}/deploy-debs
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] puzzles: upgrade to 9765
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-sato/puzzles/{puzzles_r9751.bb = puzzles_r9765.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-sato/puzzles/{puzzles_r9751.bb = puzzles_r9765.bb} (100%)
diff --git a/meta/recipes-sato/puzzles/puzzles_r9751.bb
b/meta/recipes-sato/puzzles/puzzles_r9765.bb
similarity index 100%
rename from meta/recipes-sato/puzzles/puzzles_r9751.bb
rename to meta/recipes-sato/puzzles/puzzles_r9765.bb
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ethtool: upgrade to 3.8
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-extended/ethtool/{ethtool_3.7.bb = ethtool_3.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/ethtool/{ethtool_3.7.bb = ethtool_3.8.bb} (79%)
diff --git a/meta/recipes-extended/ethtool/ethtool_3.7.bb
b/meta/recipes-extended/ethtool/ethtool_3.8.bb
similarity index 79%
rename from meta/recipes-extended/ethtool/ethtool_3.7.bb
rename to meta/recipes-extended/ethtool/ethtool_3.8.bb
index e04f1c0..3d84e70 100644
--- a/meta/recipes-extended/ethtool/ethtool_3.7.bb
+++ b/meta/recipes-extended/ethtool/ethtool_3.8.bb
@@ -9,7 +9,7 @@ PR = r0
SRC_URI = ${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz
-SRC_URI[md5sum] = dc4bfea23c9d966638284dded4306f61
-SRC_URI[sha256sum] =
8ff82984ced622ef6be300972ce208f48cdc80e81e06f433ad68c45a3e073ddf
+SRC_URI[md5sum] = ddceef30c99cee26874798821e9d6ab8
+SRC_URI[sha256sum] =
648e1c311567571f806389d85efaa063a8035e09529d0467c4ea97c9ece829d6
inherit autotools
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gpgme: upgrade to 1.4.0
License md5 checkum change due to:
- copyright year modification
- space modifications
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../{gpgme-1.3.2 = gpgme-1.4.0}/disable_gpgconf_check.patch | 0
meta/recipes-support/gpgme/{gpgme_1.3.2.bb = gpgme_1.4.0.bb} | 10 +-
2 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-support/gpgme/{gpgme-1.3.2 =
gpgme-1.4.0}/disable_gpgconf_check.patch (100%)
rename meta/recipes-support/gpgme/{gpgme_1.3.2.bb = gpgme_1.4.0.bb} (76%)
diff --git a/meta/recipes-support/gpgme/gpgme-1.3.2/disable_gpgconf_check.patch
b/meta/recipes-support/gpgme/gpgme-1.4.0/disable_gpgconf_check.patch
similarity index 100%
rename from meta/recipes-support/gpgme/gpgme-1.3.2/disable_gpgconf_check.patch
rename to meta/recipes-support/gpgme/gpgme-1.4.0/disable_gpgconf_check.patch
diff --git a/meta/recipes-support/gpgme/gpgme_1.3.2.bb
b/meta/recipes-support/gpgme/gpgme_1.4.0.bb
similarity index 76%
rename from meta/recipes-support/gpgme/gpgme_1.3.2.bb
rename to meta/recipes-support/gpgme/gpgme_1.4.0.bb
index f19892c5..23f4e4d 100644
--- a/meta/recipes-support/gpgme/gpgme_1.3.2.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.4.0.bb
@@ -5,19 +5,19 @@ BUGTRACKER = https://bugs.g10code.com/gnupg/index;
LICENSE = GPLv2+ LGPLv2.1+
LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff
\
-
file://src/gpgme.h.in;endline=23;md5=00846fee29ec2a6f5c808bfe7fc24e65 \
-
file://src/engine.h;endline=22;md5=e96acfaab1cff82dd8fbefddd2f5c436
+
file://src/gpgme.h.in;endline=23;md5=a7b9706396e8e12c17be7d8d556ef7a5 \
+
file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d
SRC_URI = ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
file://disable_gpgconf_check.patch
-SRC_URI[md5sum] = 326fe97077141713f0930aa87949a287
-SRC_URI[sha256sum] =
cfd235663f1d1adc97abb38dd5e6d093bb7e155580f171f9ba0158feab69f875
+SRC_URI[md5sum] = a0f93aba6d8a831ba14905085027f2f9
+SRC_URI[sha256sum] =
728c959abb0795ed4357b308cdbba92210d22998b075664d1e038d3cc7145619
DEPENDS = libgpg-error libassuan ${PTH}
PTH_libc-uclibc = npth
PTH = pth
-PR = r1
+PR = r0
EXTRA_OECONF = --with-pth=${STAGING_DIR_HOST} --without-pth-test \
--with-gpg=${bindir}/gpg --without-gpgsm
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libgpg-error: upgrade to 1.11
License checksum change due to:
- copyright year modification
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../{libgpg-error-1.10 = libgpg-error-1.11}/pkgconfig.patch | 0
.../libgpg-error/{libgpg-error_1.10.bb = libgpg-error_1.11.bb} | 8
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-support/libgpg-error/{libgpg-error-1.10 =
libgpg-error-1.11}/pkgconfig.patch (100%)
rename meta/recipes-support/libgpg-error/{libgpg-error_1.10.bb =
libgpg-error_1.11.bb} (77%)
diff --git
a/meta/recipes-support/libgpg-error/libgpg-error-1.10/pkgconfig.patch
b/meta/recipes-support/libgpg-error/libgpg-error-1.11/pkgconfig.patch
similarity index 100%
rename from meta/recipes-support/libgpg-error/libgpg-error-1.10/pkgconfig.patch
rename to meta/recipes-support/libgpg-error/libgpg-error-1.11/pkgconfig.patch
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
b/meta/recipes-support/libgpg-error/libgpg-error_1.11.bb
similarity index 77%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.11.bb
index 64b50b9..1caa0dd 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.11.bb
@@ -5,18 +5,18 @@ BUGTRACKER = https://bugs.g10code.com/gnupg/index;
LICENSE = GPLv2+ LGPLv2.1+
LIC_FILES_CHKSUM = file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-
file://src/gpg-error.h.in;endline=23;md5=508c78081f11544da0fbb8c95913a301 \
+
file://src/gpg-error.h.in;endline=23;md5=6ac0378874589a44d53512b3786b4bc0 \
file://src/init.c;endline=20;md5=b69742f2a8827d494c6f6a4b1768416c
SECTION = libs
-PR = r2
+PR = r0
SRC_URI = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://pkgconfig.patch
-SRC_URI[md5sum] = 736a03daa9dc5873047d4eb4a9c22a16
-SRC_URI[sha256sum] =
520629b4568b5c29b1991c8ffc267c8bdee5f223c7333c42a651b56f9b1c5431
+SRC_URI[md5sum] = b9fa55b71cae73cb2e44254c2acc4e2c
+SRC_URI[sha256sum] =
ae3376480a073b120c7add08f1e6cfcc08500648ccf22461cd42db6224a218c0
inherit autotools binconfig pkgconfig gettext
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] buildhistory.bbclass: add support for SRCREV logging
On 03/01/2013 09:29 PM, Saul Wold wrote:
On 02/27/2013 07:37 AM, Constantin Musca wrote:
- create latest_srcrev for each recipe with the following format:
${BB_FILENAME},${SRC_URI},${SRCREV},${FROM_AUTOREV}
[YOCTO #3041]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/classes/buildhistory.bbclass | 23 ++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/meta/classes/buildhistory.bbclass
b/meta/classes/buildhistory.bbclass
index a20d03d..fa13ef5 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -44,6 +44,11 @@ python buildhistory_emit_pkghistory() {
self.pr = r0
self.depends =
self.packages =
+self.bbfile =
+self.src_uri =
+self.srcrev =
+self.srcrev_autorev =
+
class PackageInfo:
def __init__(self, name):
@@ -151,6 +156,12 @@ python buildhistory_emit_pkghistory() {
pe = d.getVar('PE', True) or 0
pv = d.getVar('PV', True)
pr = d.getVar('PR', True)
+
+bbfile = d.getVar('BB_FILENAME', True)
+src_uri = d.getVar('SRC_URI', True)
+srcrev = d.getVar('SRCREV', True)
+srcrev_autorev = 'yes' if d.getVar('SRCREV', False) == 'AUTOINC'
else 'no'
+
packages = squashspaces(d.getVar('PACKAGES', True))
packagelist = packages.split()
@@ -159,7 +170,7 @@ python buildhistory_emit_pkghistory() {
else:
# Remove files for packages that no longer exist
for item in os.listdir(pkghistdir):
-if item != latest:
+if item != latest and item != latest_srcrev:
if item not in packagelist:
subdir = os.path.join(pkghistdir, item)
for subfile in os.listdir(subdir):
@@ -171,6 +182,10 @@ python buildhistory_emit_pkghistory() {
rcpinfo.pv = pv
rcpinfo.pr = pr
rcpinfo.depends = sortlist(squashspaces(d.getVar('DEPENDS',
True) or ))
+rcpinfo.bbfile = bbfile
+rcpinfo.src_uri = src_uri
+rcpinfo.srcrev = srcrev
+rcpinfo.srcrev_autorev = srcrev_autorev
rcpinfo.packages = packages
write_recipehistory(rcpinfo, d)
@@ -241,6 +256,12 @@ def write_recipehistory(rcpinfo, d):
f.write(DEPENDS = %s\n % rcpinfo.depends)
f.write(PACKAGES = %s\n % rcpinfo.packages)
+if rcpinfo.srcrev:
+srcrevfile = os.path.join(pkghistdir, latest_srcrev)
+with open(srcrevfile, w) as f:
+f.write(','.join([rcpinfo.bbfile, rcpinfo.src_uri,
rcpinfo.srcrev,
+rcpinfo.srcrev_autorev]))
+
def write_pkghistory(pkginfo, d):
bb.debug(2, Writing package history for package %s %
pkginfo.name)
I found the following problem with multiple builds:
ERROR: The stack trace of python calls that resulted in this
exception/failure was:
ERROR: File buildhistory_emit_pkghistory, line 200, in module
ERROR:
ERROR: File buildhistory_emit_pkghistory, line 136, in
buildhistory_emit_pkghistory
ERROR:
ERROR: The code that was being executed was:
ERROR: 0196:
ERROR: 0197:write_pkghistory(pkginfo, d)
ERROR: 0198:
ERROR: 0199:
ERROR: *** 0200:buildhistory_emit_pkghistory(d)
ERROR: 0201:
ERROR: [From file: 'buildhistory_emit_pkghistory', lineno: 200,
function: module]
ERROR: 0132:for item in os.listdir(pkghistdir):
ERROR: 0133:if item != latest:
The patch changes this line to : if item != latest and item !=
latest_srcrev:
I think the patch has not been applied correctly. I tested this locally
and it worked.
Cheers,
Constantin
ERROR: 0134:if item not in packagelist:
ERROR: 0135:subdir =
os.path.join(pkghistdir, item)
ERROR: *** 0136:for subfile in os.listdir(subdir):
ERROR: 0137: os.unlink(os.path.join(subdir, subfile))
ERROR: 0138:os.rmdir(subdir)
ERROR: 0139:
ERROR: 0140:rcpinfo = RecipeInfo(pn)
ERROR: [From file: 'buildhistory_emit_pkghistory', lineno: 136,
function: buildhistory_emit_pkghistory]
ERROR: Function failed: buildhistory_emit_pkghistory
ERROR: Logfile of failure stored in:
/home/sgw/yocto/builds/world/tmp/work/x86_64-poky-linux/libgcc/4.7.2-r19/temp/log.do_package.24155
ERROR: Task 953
(/home/sgw/yocto/poky/meta/recipes-devtools/gcc/libgcc_4.7.bb,
do_package) failed with exit code '1'
It occurs with base-files also.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] apt: upgrade to 0.9.7.7
bb files: remove invalid config.sub/config.guess files (autotools will
generate the correct files)
allocate-larger-memory.patch: not needed anymore
fix-gcc-4.6-null-not-defined.patch: added
- include header that defines NULL
includes-fix.patch: not needed anymore
localefixes.patch: removed
- not necessary anymore (no compiling errors)
makerace.patch: adapted to the new version
no-ko-translation.patch: adapted to the new version
no-nls-dpkg.patch: added
- fix build without nls
noconfigure.patch: adapted to the new version
nodoc.patch: adapted to the new version (apply patch on all cases
because the doc generation needs docbook-xsl)
remove-redeclaration.patch: not needed anymore
truncate-filename.patch: moved
use-host.patch: adapted to the new version
no-curl.patch: adapted to the new version
disable-configure-in-makefile.patch: added
- do not run configure at do_compile
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../apt/apt-0.7.14/allocate-larger-memory.patch| 75 --
.../apt/apt-0.7.14/includes-fix.patch | 44 ---
.../apt/apt-0.7.14/localefixes.patch | 91 --
.../apt/apt-0.7.14/remove-redeclaration.patch | 63 ---
.../disable-configure-in-makefile.patch| 18 +
.../apt-0.9.7.7/fix-gcc-4.6-null-not-defined.patch | 10 +++
.../apt/{apt-0.7.14 = apt-0.9.7.7}/makerace.patch | 0
.../no-ko-translation.patch| 8 +-
.../apt/apt-0.9.7.7/no-nls-dpkg.patch | 24 ++
.../{apt-0.7.14 = apt-0.9.7.7}/noconfigure.patch | 39 +-
.../apt/{apt-0.7.14 = apt-0.9.7.7}/nodoc.patch| 21 +++--
.../truncate-filename.patch| 0
.../apt/{apt-0.7.14 = apt-0.9.7.7}/use-host.patch | 37 +
meta/recipes-devtools/apt/apt-native.inc | 2 +
...{apt-native_0.7.14.bb = apt-native_0.9.7.7.bb} | 12 ++-
meta/recipes-devtools/apt/apt-package.inc | 39 ++
meta/recipes-devtools/apt/apt.inc | 12 ++-
.../apt/{apt_0.7.14.bb = apt_0.9.7.7.bb} | 8 +-
meta/recipes-devtools/apt/files/no-curl.patch | 26 +++
19 files changed, 122 insertions(+), 407 deletions(-)
delete mode 100644
meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch
delete mode 100644 meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
delete mode 100644 meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch
delete mode 100644
meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch
create mode 100644
meta/recipes-devtools/apt/apt-0.9.7.7/disable-configure-in-makefile.patch
create mode 100644
meta/recipes-devtools/apt/apt-0.9.7.7/fix-gcc-4.6-null-not-defined.patch
rename meta/recipes-devtools/apt/{apt-0.7.14 = apt-0.9.7.7}/makerace.patch
(100%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.9.7.7}/no-ko-translation.patch (28%)
create mode 100644 meta/recipes-devtools/apt/apt-0.9.7.7/no-nls-dpkg.patch
rename meta/recipes-devtools/apt/{apt-0.7.14 = apt-0.9.7.7}/noconfigure.patch
(23%)
rename meta/recipes-devtools/apt/{apt-0.7.14 = apt-0.9.7.7}/nodoc.patch (32%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.9.7.7}/truncate-filename.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.7.14 = apt-0.9.7.7}/use-host.patch
(31%)
rename meta/recipes-devtools/apt/{apt-native_0.7.14.bb =
apt-native_0.9.7.7.bb} (26%)
rename meta/recipes-devtools/apt/{apt_0.7.14.bb = apt_0.9.7.7.bb} (64%)
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch
b/meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch
deleted file mode 100644
index 36e1499..000
--- a/meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Method file has died unexpectedly
-
-Method file has died unexpectedly!, this is because the char S[1024]
-is not enough for the long the URI, char S[2048] would be enough.
-
-It would be boring if we use malloc here since we can't know how much
-memory is needed except strelen() every component of it. So similarly
-use char S[2048] as it did before.
-
-Upstream-Status: Pending
-Signed-off-by: Robert Yang liezhi.y...@windriver.com
- apt-pkg/acquire-method.cc | 12 ++--
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
a/apt-pkg/acquire-method.cc
-+++ b/apt-pkg/acquire-method.cc
-@@ -95,7 +95,7 @@ void pkgAcqMethod::Fail(string Err,bool Transient)
-*I = ' ';
-}
-
-- char S[1024];
-+ char S[2048];
-if (Queue != 0)
-{
- snprintf(S,sizeof(S)-50,400 URI Failure\nURI: %s\n
-@@ -132,7 +132,7 @@ void pkgAcqMethod::URIStart(FetchResult Res)
-if (Queue == 0)
- abort();
-
-- char S[1024] = ;
-+ char S[2048] = ;
-char *End = S;
-
-End += snprintf(S,sizeof(S),200 URI Start\nURI: %s\n,Queue-Uri.c_str());
-@@ -160,7
Re: [OE-core] [PATCH] apt: upgrade to 0.9.7.7
On 03/01/2013 05:06 PM, Constantin Musca wrote:
bb files: remove invalid config.sub/config.guess files (autotools will
generate the correct files)
allocate-larger-memory.patch: not needed anymore
fix-gcc-4.6-null-not-defined.patch: added
- include header that defines NULL
includes-fix.patch: not needed anymore
localefixes.patch: removed
- not necessary anymore (no compiling errors)
makerace.patch: adapted to the new version
no-ko-translation.patch: adapted to the new version
no-nls-dpkg.patch: added
- fix build without nls
noconfigure.patch: adapted to the new version
nodoc.patch: adapted to the new version (apply patch on all cases
because the doc generation needs docbook-xsl)
remove-redeclaration.patch: not needed anymore
truncate-filename.patch: moved
use-host.patch: adapted to the new version
no-curl.patch: adapted to the new version
disable-configure-in-makefile.patch: added
- do not run configure at do_compile
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../apt/apt-0.7.14/allocate-larger-memory.patch| 75 --
.../apt/apt-0.7.14/includes-fix.patch | 44 ---
.../apt/apt-0.7.14/localefixes.patch | 91 --
.../apt/apt-0.7.14/remove-redeclaration.patch | 63 ---
.../disable-configure-in-makefile.patch| 18 +
.../apt-0.9.7.7/fix-gcc-4.6-null-not-defined.patch | 10 +++
.../apt/{apt-0.7.14 = apt-0.9.7.7}/makerace.patch | 0
.../no-ko-translation.patch| 8 +-
.../apt/apt-0.9.7.7/no-nls-dpkg.patch | 24 ++
.../{apt-0.7.14 = apt-0.9.7.7}/noconfigure.patch | 39 +-
.../apt/{apt-0.7.14 = apt-0.9.7.7}/nodoc.patch| 21 +++--
.../truncate-filename.patch| 0
.../apt/{apt-0.7.14 = apt-0.9.7.7}/use-host.patch | 37 +
meta/recipes-devtools/apt/apt-native.inc | 2 +
...{apt-native_0.7.14.bb = apt-native_0.9.7.7.bb} | 12 ++-
meta/recipes-devtools/apt/apt-package.inc | 39 ++
meta/recipes-devtools/apt/apt.inc | 12 ++-
.../apt/{apt_0.7.14.bb = apt_0.9.7.7.bb} | 8 +-
meta/recipes-devtools/apt/files/no-curl.patch | 26 +++
19 files changed, 122 insertions(+), 407 deletions(-)
delete mode 100644
meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch
delete mode 100644 meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
delete mode 100644 meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch
delete mode 100644
meta/recipes-devtools/apt/apt-0.7.14/remove-redeclaration.patch
create mode 100644
meta/recipes-devtools/apt/apt-0.9.7.7/disable-configure-in-makefile.patch
create mode 100644
meta/recipes-devtools/apt/apt-0.9.7.7/fix-gcc-4.6-null-not-defined.patch
rename meta/recipes-devtools/apt/{apt-0.7.14 = apt-0.9.7.7}/makerace.patch
(100%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.9.7.7}/no-ko-translation.patch (28%)
create mode 100644 meta/recipes-devtools/apt/apt-0.9.7.7/no-nls-dpkg.patch
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.9.7.7}/noconfigure.patch (23%)
rename meta/recipes-devtools/apt/{apt-0.7.14 = apt-0.9.7.7}/nodoc.patch (32%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.9.7.7}/truncate-filename.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.7.14 = apt-0.9.7.7}/use-host.patch
(31%)
rename meta/recipes-devtools/apt/{apt-native_0.7.14.bb =
apt-native_0.9.7.7.bb} (26%)
rename meta/recipes-devtools/apt/{apt_0.7.14.bb = apt_0.9.7.7.bb} (64%)
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch
b/meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch
deleted file mode 100644
index 36e1499..000
--- a/meta/recipes-devtools/apt/apt-0.7.14/allocate-larger-memory.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Method file has died unexpectedly
-
-Method file has died unexpectedly!, this is because the char S[1024]
-is not enough for the long the URI, char S[2048] would be enough.
-
-It would be boring if we use malloc here since we can't know how much
-memory is needed except strelen() every component of it. So similarly
-use char S[2048] as it did before.
-
-Upstream-Status: Pending
-Signed-off-by: Robert Yang liezhi.y...@windriver.com
- apt-pkg/acquire-method.cc | 12 ++--
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
a/apt-pkg/acquire-method.cc
-+++ b/apt-pkg/acquire-method.cc
-@@ -95,7 +95,7 @@ void pkgAcqMethod::Fail(string Err,bool Transient)
-*I = ' ';
-}
-
-- char S[1024];
-+ char S[2048];
-if (Queue != 0)
-{
- snprintf(S,sizeof(S)-50,400 URI Failure\nURI: %s\n
-@@ -132,7 +132,7 @@ void pkgAcqMethod::URIStart(FetchResult Res)
-if (Queue == 0)
- abort();
-
-- char S[1024] = ;
-+ char S[2048] = ;
-char *End = S;
-
-End += snprintf
[OE-core] [PATCH] buildhistory.bbclass: add support for SRCREV logging
- create latest_srcrev for each recipe with the following format:
${BB_FILENAME},${SRC_URI},${SRCREV},${FROM_AUTOREV}
[YOCTO #3041]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/classes/buildhistory.bbclass | 23 ++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/meta/classes/buildhistory.bbclass
b/meta/classes/buildhistory.bbclass
index a20d03d..fa13ef5 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -44,6 +44,11 @@ python buildhistory_emit_pkghistory() {
self.pr = r0
self.depends =
self.packages =
+self.bbfile =
+self.src_uri =
+self.srcrev =
+self.srcrev_autorev =
+
class PackageInfo:
def __init__(self, name):
@@ -151,6 +156,12 @@ python buildhistory_emit_pkghistory() {
pe = d.getVar('PE', True) or 0
pv = d.getVar('PV', True)
pr = d.getVar('PR', True)
+
+bbfile = d.getVar('BB_FILENAME', True)
+src_uri = d.getVar('SRC_URI', True)
+srcrev = d.getVar('SRCREV', True)
+srcrev_autorev = 'yes' if d.getVar('SRCREV', False) == 'AUTOINC' else 'no'
+
packages = squashspaces(d.getVar('PACKAGES', True))
packagelist = packages.split()
@@ -159,7 +170,7 @@ python buildhistory_emit_pkghistory() {
else:
# Remove files for packages that no longer exist
for item in os.listdir(pkghistdir):
-if item != latest:
+if item != latest and item != latest_srcrev:
if item not in packagelist:
subdir = os.path.join(pkghistdir, item)
for subfile in os.listdir(subdir):
@@ -171,6 +182,10 @@ python buildhistory_emit_pkghistory() {
rcpinfo.pv = pv
rcpinfo.pr = pr
rcpinfo.depends = sortlist(squashspaces(d.getVar('DEPENDS', True) or ))
+rcpinfo.bbfile = bbfile
+rcpinfo.src_uri = src_uri
+rcpinfo.srcrev = srcrev
+rcpinfo.srcrev_autorev = srcrev_autorev
rcpinfo.packages = packages
write_recipehistory(rcpinfo, d)
@@ -241,6 +256,12 @@ def write_recipehistory(rcpinfo, d):
f.write(DEPENDS = %s\n % rcpinfo.depends)
f.write(PACKAGES = %s\n % rcpinfo.packages)
+if rcpinfo.srcrev:
+srcrevfile = os.path.join(pkghistdir, latest_srcrev)
+with open(srcrevfile, w) as f:
+f.write(','.join([rcpinfo.bbfile, rcpinfo.src_uri, rcpinfo.srcrev,
+rcpinfo.srcrev_autorev]))
+
def write_pkghistory(pkginfo, d):
bb.debug(2, Writing package history for package %s % pkginfo.name)
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] log_srcrev.bbclass: add a bbclass for logging SRCREVs
- add a task which creates a file for each package with the following
format:
${BB_FILENAME},${SRC_URI},${SRCREV},${FROM_AUTOREV}
[YOCTO #3041]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/classes/log_srcrev.bbclass | 15 +++
1 file changed, 15 insertions(+)
create mode 100644 meta/classes/log_srcrev.bbclass
diff --git a/meta/classes/log_srcrev.bbclass b/meta/classes/log_srcrev.bbclass
new file mode 100644
index 000..d5d0284
--- /dev/null
+++ b/meta/classes/log_srcrev.bbclass
@@ -0,0 +1,15 @@
+python do_log_srcrev () {
+srcrev = d.getVar('SRCREV', True)
+if srcrev:
+bbfile = d.getVar('BB_FILENAME', True)
+src_uri = d.getVar('SRC_URI', True)
+from_autorev = 'yes' if d.getVar('SRCREV', False) == 'AUTOINC' else
'no'
+
+srcrevfile =
d.expand('${TMPDIR}/srcrevs/${MULTIMACH_TARGET_SYS}/${BP}-${PV}')
+bb.utils.mkdirhier(os.path.dirname(srcrevfile))
+
+with open(srcrevfile, 'w') as f:
+f.write(','.join([bbfile, src_uri, srcrev, from_autorev]))
+}
+
+addtask do_log_srcrev after do_fetch
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] log_srcrev.bbclass: add a bbclass for logging SRCREVs
- add a task which creates a file for each package with the following
format:
${BB_FILENAME},${SRC_URI},${SRCREV},${FROM_AUTOREV}
[YOCTO #3041]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/classes/log_srcrev.bbclass | 15 +++
1 file changed, 15 insertions(+)
create mode 100644 meta/classes/log_srcrev.bbclass
diff --git a/meta/classes/log_srcrev.bbclass b/meta/classes/log_srcrev.bbclass
new file mode 100644
index 000..a04702c
--- /dev/null
+++ b/meta/classes/log_srcrev.bbclass
@@ -0,0 +1,15 @@
+python do_log_srcrev () {
+srcrev = d.getVar('SRCREV', True)
+if srcrev:
+bbfile = d.getVar('BB_FILENAME', True)
+src_uri = d.getVar('SRC_URI', True)
+from_autorev = 'yes' if d.getVar('SRCREV', False) == 'AUTOINC' else
'no'
+
+srcrevfile =
d.expand('${TMPDIR}/srcrevs/${MULTIMACH_TARGET_SYS}/${BP}')
+bb.utils.mkdirhier(os.path.dirname(srcrevfile))
+
+with open(srcrevfile, 'w') as f:
+f.write(','.join([bbfile, src_uri, srcrev, from_autorev]))
+}
+
+addtask do_log_srcrev after do_fetch
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] apt: upgrade to 0.8.10.3+squeeze1
bb files:
- remove invalid config.sub/config.guess files (autotools will
generate the correct files)
- disable doc (the docbook-xsl package is needed for building the
documentation)
- remove inexistent doc files
allocate-larger-memory.patch: adapted to the new version
fix-gcc-4.6-null-not-defined.patch: added
- include header that defines NULL
includes-fix.patch: removed, not needed anymore
localefixes.patch: removed
- not necessary anymore (no compiling errors)
makerace.patch: adapted to the new version
no-ko-translation.patch: adapted to the new version
no-nls-dpkg.patch: added
- fix build without nls
noconfigure.patch: adapted to the new version
nodoc.patch: adapted to the new version (apply patch on all cases
because the doc generation needs docbook-xsl)
remove-redeclaration.patch: adapted to the new version
truncate-filename.patch: moved
use-host.patch: adapted to the new version
no-curl.patch: adapted to the new version
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../apt/apt-0.7.14/includes-fix.patch | 44 ---
.../apt/apt-0.7.14/localefixes.patch | 91 --
.../allocate-larger-memory.patch | 28 ---
.../fix-gcc-4.6-null-not-defined.patch | 15
.../makerace.patch | 1 +
.../no-ko-translation.patch| 11 ++-
.../apt/apt-0.8.10.3+squeeze1/no-nls-dpkg.patch| 29 +++
.../noconfigure.patch | 18 +++--
.../nodoc.patch| 3 +
.../remove-redeclaration.patch | 16 ++--
.../truncate-filename.patch| 0
.../use-host.patch | 30 +++
meta/recipes-devtools/apt/apt-native.inc | 2 +
...e_0.7.14.bb = apt-native_0.8.10.3+squeeze1.bb} | 12 ++-
meta/recipes-devtools/apt/apt-package.inc | 39 ++
meta/recipes-devtools/apt/apt.inc | 9 ++-
.../{apt_0.7.14.bb = apt_0.8.10.3+squeeze1.bb}| 9 +--
meta/recipes-devtools/apt/files/no-curl.patch | 29 +++
18 files changed, 136 insertions(+), 250 deletions(-)
delete mode 100644 meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
delete mode 100644 meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/allocate-larger-memory.patch (70%)
create mode 100644
meta/recipes-devtools/apt/apt-0.8.10.3+squeeze1/fix-gcc-4.6-null-not-defined.patch
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/makerace.patch (93%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/no-ko-translation.patch (25%)
create mode 100644
meta/recipes-devtools/apt/apt-0.8.10.3+squeeze1/no-nls-dpkg.patch
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/noconfigure.patch (54%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/nodoc.patch (87%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/remove-redeclaration.patch (81%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/truncate-filename.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/use-host.patch (55%)
rename meta/recipes-devtools/apt/{apt-native_0.7.14.bb =
apt-native_0.8.10.3+squeeze1.bb} (26%)
rename meta/recipes-devtools/apt/{apt_0.7.14.bb = apt_0.8.10.3+squeeze1.bb}
(64%)
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
b/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
deleted file mode 100644
index c85c388..000
--- a/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Upstream-Status: Backport
-
-Add missing includes required when building with modern toolchain, based on
-patch from Debian bugzilla:
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505954
-
-Should no longer be required once upgraded to 0.7.22 or later.
-
-Index: apt-0.7.14/apt-pkg/acquire.cc
-===
apt-0.7.14.orig/apt-pkg/acquire.cc 2008-05-28 14:22:13.0 +0100
-+++ apt-0.7.14/apt-pkg/acquire.cc 2010-07-23 17:30:11.494883936 +0100
-@@ -22,6 +22,7 @@
-
- #include apti18n.h
-
-+#include cstdio
- #include iostream
- #include sstream
-
-Index: apt-0.7.14/apt-pkg/contrib/sha256.h
-===
apt-0.7.14.orig/apt-pkg/contrib/sha256.h 2008-05-28 14:22:14.0
+0100
-+++ apt-0.7.14/apt-pkg/contrib/sha256.h2010-07-23 17:30:11.494883936
+0100
-@@ -14,6 +14,7 @@
- #ifndef APTPKG_SHA256_H
- #define APTPKG_SHA256_H
-
-+#include stdint.h
- #include string
- #include cstring
- #include algorithm
-Index: apt-0.7.14/apt-pkg/deb/dpkgpm.cc
Re: [OE-core] [PATCH] apt: upgrade to 0.8.10.3+squeeze1
On 02/25/2013 05:17 PM, Constantin Musca wrote:
bb files:
- remove invalid config.sub/config.guess files (autotools will
generate the correct files)
- disable doc (the docbook-xsl package is needed for building the
documentation)
- remove inexistent doc files
allocate-larger-memory.patch: adapted to the new version
fix-gcc-4.6-null-not-defined.patch: added
- include header that defines NULL
includes-fix.patch: removed, not needed anymore
localefixes.patch: removed
- not necessary anymore (no compiling errors)
makerace.patch: adapted to the new version
no-ko-translation.patch: adapted to the new version
no-nls-dpkg.patch: added
- fix build without nls
noconfigure.patch: adapted to the new version
nodoc.patch: adapted to the new version (apply patch on all cases
because the doc generation needs docbook-xsl)
remove-redeclaration.patch: adapted to the new version
truncate-filename.patch: moved
use-host.patch: adapted to the new version
no-curl.patch: adapted to the new version
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../apt/apt-0.7.14/includes-fix.patch | 44 ---
.../apt/apt-0.7.14/localefixes.patch | 91 --
.../allocate-larger-memory.patch | 28 ---
.../fix-gcc-4.6-null-not-defined.patch | 15
.../makerace.patch | 1 +
.../no-ko-translation.patch| 11 ++-
.../apt/apt-0.8.10.3+squeeze1/no-nls-dpkg.patch| 29 +++
.../noconfigure.patch | 18 +++--
.../nodoc.patch| 3 +
.../remove-redeclaration.patch | 16 ++--
.../truncate-filename.patch| 0
.../use-host.patch | 30 +++
meta/recipes-devtools/apt/apt-native.inc | 2 +
...e_0.7.14.bb = apt-native_0.8.10.3+squeeze1.bb} | 12 ++-
meta/recipes-devtools/apt/apt-package.inc | 39 ++
meta/recipes-devtools/apt/apt.inc | 9 ++-
.../{apt_0.7.14.bb = apt_0.8.10.3+squeeze1.bb}| 9 +--
meta/recipes-devtools/apt/files/no-curl.patch | 29 +++
18 files changed, 136 insertions(+), 250 deletions(-)
delete mode 100644 meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
delete mode 100644 meta/recipes-devtools/apt/apt-0.7.14/localefixes.patch
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/allocate-larger-memory.patch (70%)
create mode 100644
meta/recipes-devtools/apt/apt-0.8.10.3+squeeze1/fix-gcc-4.6-null-not-defined.patch
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/makerace.patch (93%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/no-ko-translation.patch (25%)
create mode 100644
meta/recipes-devtools/apt/apt-0.8.10.3+squeeze1/no-nls-dpkg.patch
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/noconfigure.patch (54%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/nodoc.patch (87%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/remove-redeclaration.patch (81%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/truncate-filename.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.7.14 =
apt-0.8.10.3+squeeze1}/use-host.patch (55%)
rename meta/recipes-devtools/apt/{apt-native_0.7.14.bb =
apt-native_0.8.10.3+squeeze1.bb} (26%)
rename meta/recipes-devtools/apt/{apt_0.7.14.bb = apt_0.8.10.3+squeeze1.bb}
(64%)
diff --git a/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
b/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
deleted file mode 100644
index c85c388..000
--- a/meta/recipes-devtools/apt/apt-0.7.14/includes-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Upstream-Status: Backport
-
-Add missing includes required when building with modern toolchain, based on
-patch from Debian bugzilla:
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505954
-
-Should no longer be required once upgraded to 0.7.22 or later.
-
-Index: apt-0.7.14/apt-pkg/acquire.cc
-===
apt-0.7.14.orig/apt-pkg/acquire.cc 2008-05-28 14:22:13.0 +0100
-+++ apt-0.7.14/apt-pkg/acquire.cc 2010-07-23 17:30:11.494883936 +0100
-@@ -22,6 +22,7 @@
-
- #include apti18n.h
-
-+#include cstdio
- #include iostream
- #include sstream
-
-Index: apt-0.7.14/apt-pkg/contrib/sha256.h
-===
apt-0.7.14.orig/apt-pkg/contrib/sha256.h 2008-05-28 14:22:14.0
+0100
-+++ apt-0.7.14/apt-pkg/contrib/sha256.h2010-07-23 17:30:11.494883936
+0100
-@@ -14,6 +14,7 @@
- #ifndef APTPKG_SHA256_H
- #define APTPKG_SHA256_H
-
-+#include stdint.h
- #include string
- #include cstring
- #include algorithm
-Index: apt-0.7.14/apt-pkg/deb
[OE-core] [PATCH] augeas: change SRC_URI
- replace http://augeas.net/download/${BP}.tar.gz with
http://download.augeas.net/${BP}.tar.gz
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-extended/augeas/augeas.inc | 2 +-
meta/recipes-extended/augeas/augeas_1.0.0.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/augeas/augeas.inc
b/meta/recipes-extended/augeas/augeas.inc
index a0aa9dd..c956621 100644
--- a/meta/recipes-extended/augeas/augeas.inc
+++ b/meta/recipes-extended/augeas/augeas.inc
@@ -5,7 +5,7 @@ BUGTRACKER = https://fedorahosted.org/augeas/report/1;
LICENSE = LGPLv2.1+
LIC_FILES_CHKSUM = file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff
-SRC_URI = http://augeas.net/download/${BP}.tar.gz \
+SRC_URI = http://download.augeas.net/${BP}.tar.gz \
file://add-missing-argz-conditional.patch \
diff --git a/meta/recipes-extended/augeas/augeas_1.0.0.bb
b/meta/recipes-extended/augeas/augeas_1.0.0.bb
index 2f7061a..82bda19 100644
--- a/meta/recipes-extended/augeas/augeas_1.0.0.bb
+++ b/meta/recipes-extended/augeas/augeas_1.0.0.bb
@@ -1,6 +1,6 @@
require augeas.inc
-PR = r0
+PR = r1
SRC_URI[md5sum] = 82131019432ecf8102e1491610ad2dd1
SRC_URI[sha256sum] =
31bf757c5b8197765946b3805f3793c32b03cd92a7a77ec95d37e71a1f131912
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] apt: upgrade to 0.8.10.3+squeeze1
On 02/25/2013 05:52 PM, Marcin Juszkiewicz wrote: Why not version from wheezy? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core Because the version from wheezy is unstable. Cheers, Constantin ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libassuan: upgrade to 2.1.0
- license checksum change due to addition of
Copyright (C) 2001, 2002, 2012, 2013 g10 Code GmbH
libassuan-add-pkgconfig-support.patch: adapted to the new version
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../files/libassuan-add-pkgconfig-support.patch| 44 +++---
.../{libassuan_2.0.3.bb = libassuan_2.1.0.bb} | 6 +--
2 files changed, 24 insertions(+), 26 deletions(-)
rename meta/recipes-support/libassuan/{libassuan_2.0.3.bb =
libassuan_2.1.0.bb} (73%)
diff --git
a/meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch
b/meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch
index ba33252..ac1604f 100644
--- a/meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch
@@ -1,18 +1,18 @@
-Upstream-Status: Rejected
-
Add pkgconfig support to libassuan.
This patch is rejected by upstream for the reason below:
They think pkgconfig adds no portability and maintaining them is not
worthwhile.
+Upstream-Status: Rejected
Signed-off-by: Chen Qi qi.c...@windriver.com
+Signed-off-by: Constantin Musca constantinx.mu...@intel.com
-Index: Makefile.am
-==
a/Makefile.am
-+++ b/Makefile.am
-@@ -21,11 +21,14 @@
- ACLOCAL_AMFLAGS = -I m4
- AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
+Index: libassuan-2.1.0/Makefile.am
+===
+--- libassuan-2.1.0.orig/Makefile.am
libassuan-2.1.0/Makefile.am
+@@ -24,10 +24,13 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gz
+ # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
+ GITLOG_TO_CHANGELOG=gitlog-to-changelog
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = assuan.pc
@@ -20,16 +20,15 @@ Index: Makefile.am
EXTRA_DIST = config.rpath autogen.sh README.GIT \
ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \
tests/ChangeLog-2011 contrib/ChangeLog-2011 \
- build-aux/gitlog-to-changelog build-aux/git-log-footer \
-- build-aux/git-log-fix
-+ build-aux/git-log-fix assuan.pc.in
+- build-aux/git-log-footer build-aux/git-log-fix
++ build-aux/git-log-footer build-aux/git-log-fix assuan.pc.in
SUBDIRS = m4 src doc tests
-Index: assuan.pc.in
-==
+Index: libassuan-2.1.0/assuan.pc.in
+===
--- /dev/null
-+++ b/assuan.pc.in
libassuan-2.1.0/assuan.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@@ -43,17 +42,16 @@ Index: assuan.pc.in
+Libs: -L${libdir} -lassuan
+Libs.private: -lgpg-error
+Cflags: -I${includedir}
-Index: configure.ac
-==
a/configure.ac
-+++ b/configure.ac
-@@ -380,5 +380,5 @@ AC_CONFIG_FILES([doc/Makefile])
+Index: libassuan-2.1.0/configure.ac
+===
+--- libassuan-2.1.0.orig/configure.ac
libassuan-2.1.0/configure.ac
+@@ -433,7 +433,7 @@ AC_CONFIG_FILES([doc/Makefile])
AC_CONFIG_FILES([tests/Makefile])
AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config])
AC_CONFIG_FILES([src/versioninfo.rc])
-
+AC_CONFIG_FILES([assuan.pc])
AC_OUTPUT
---
-1.7.5.4
-
+
+ echo
diff --git a/meta/recipes-support/libassuan/libassuan_2.0.3.bb
b/meta/recipes-support/libassuan/libassuan_2.1.0.bb
similarity index 73%
rename from meta/recipes-support/libassuan/libassuan_2.0.3.bb
rename to meta/recipes-support/libassuan/libassuan_2.1.0.bb
index f0d7c9f..0483560 100644
--- a/meta/recipes-support/libassuan/libassuan_2.0.3.bb
+++ b/meta/recipes-support/libassuan/libassuan_2.1.0.bb
@@ -5,7 +5,7 @@ BUGTRACKER = https://bugs.g10code.com/gnupg/index;
LICENSE = GPLv3 LGPLv2.1+
LIC_FILES_CHKSUM = file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-
file://src/assuan.c;endline=20;md5=fbd7f2a44aab170430d59380f94f85f8 \
+
file://src/assuan.c;endline=20;md5=0f465544183405055ec179869fc5b5ba \
file://src/assuan-defs.h;endline=20;md5=20cd55535260ca1779edae5c7b80b21e
DEPENDS = libgpg-error
@@ -13,7 +13,7 @@ DEPENDS = libgpg-error
SRC_URI = ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2 \
file://libassuan-add-pkgconfig-support.patch
-SRC_URI[md5sum] = 179d1918325fdb928c7bd90b8a514fc7
-SRC_URI[sha256sum] =
bad5682374c76bcc0abb1a7a34c9557af6874a477500748e64a7d3def79cac1b
+SRC_URI[md5sum] = b3231eec8e567f4f9294474a387378f5
+SRC_URI[sha256sum] =
a4c5bd3a0c2726e8bcc2ea8a3b15f7aae3bd92d4f85968f315fd3a75d101c267
inherit autotools binconfig pkgconfig
[OE-core] [PATCH] log_srcrev.bbclass: add a bbclass for logging SRCREVs
- add a task which creates a file for each package with the following
format:
BB_FILENAME: ${BB_FILENAME}
SRC_URI: ${SRC_URI}
SRCREV: ${SRCREV}
FROM AUTOREV: no/yes
[YOCTO #3041]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/classes/log_srcrev.bbclass | 20
1 file changed, 20 insertions(+)
create mode 100644 meta/classes/log_srcrev.bbclass
diff --git a/meta/classes/log_srcrev.bbclass b/meta/classes/log_srcrev.bbclass
new file mode 100644
index 000..b319e7b
--- /dev/null
+++ b/meta/classes/log_srcrev.bbclass
@@ -0,0 +1,20 @@
+SRCREV_LOGFILE ??= 'srcrev_log'
+
+python do_log_srcrev () {
+srcrev = d.getVar('SRCREV', True)
+if srcrev:
+bbfile = d.getVar('BB_FILENAME', True)
+src_uri = d.getVar('SRC_URI', True)
+from_autorev = 'yes' if d.getVar('SRCREV', False) == 'AUTOINC' else
'no'
+
+srcrevdir =
d.expand('${TMPDIR}/srcrevs/${MULTIMACH_TARGET_SYS}/${PN}-${PV}/')
+srcrevfile = os.path.join(srcrevdir, d.getVar('SRCREV_LOGFILE', True))
+bb.utils.mkdirhier(os.path.dirname(srcrevfile))
+
+with open(srcrevfile, 'w') as f:
+f.write(BB_FILENAME: %s\nSRC_URI: %s\nSRCREV: %s\nFROM AUTOREV:
%s\n
+% (bbfile, src_uri, srcrev, from_autorev))
+}
+
+addtask do_log_srcrev after do_fetch
+do_log_srcrev[cleandirs] =
${TMPDIR}/srcrevs/${MULTIMACH_TARGET_SYS}/${PN}-${PV}/
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] jpeg: upgrade to 9
On 02/18/2013 06:04 PM, Marko Lindqvist wrote: On 18 February 2013 17:47, Constantin Musca constantinx.mu...@intel.com wrote: License checksum change due to: - version modification - links modification - additional license explanations fix_for_automake_1.12.1.patch: not needed anymore fix-jmorecfg-boolean-enum.patch: added - we have to undef TRUE FALSE in order to define the boolean enum Signed-off-by: Constantin Musca constantinx.mu...@intel.com Have you tried to build webkit-gtk against this? At one point I had similar jpeg update in my tree causing webkit-gtk build failure. - ML You are right. The problem is that I can't upgrade webkit-gtk because the new version requires ruby. Cheers, Constantin ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] groff: upgrade to 1.22.2
- add code for generating the gnulib configure script
- replace /usr/bin/perl with /usr/bin/env perl
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../groff/{groff_1.20.1.bb = groff_1.22.2.bb} | 16
1 file changed, 12 insertions(+), 4 deletions(-)
rename meta/recipes-extended/groff/{groff_1.20.1.bb = groff_1.22.2.bb} (79%)
diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb
b/meta/recipes-extended/groff/groff_1.22.2.bb
similarity index 79%
rename from meta/recipes-extended/groff/groff_1.20.1.bb
rename to meta/recipes-extended/groff/groff_1.22.2.bb
index 157365b..d1361ab 100644
--- a/meta/recipes-extended/groff/groff_1.20.1.bb
+++ b/meta/recipes-extended/groff/groff_1.22.2.bb
@@ -4,14 +4,14 @@ formatting commands and produces formatted output.
SECTION = base
HOMEPAGE = ftp://ftp.gnu.org/gnu/groff/;
LICENSE = GPLv2
-PR = r2
+PR = r0
LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504
SRC_URI = ${GNU_MIRROR}/groff/groff-${PV}.tar.gz
-SRC_URI[md5sum] = 48fa768dd6fdeb7968041dd5ae8e2b02
-SRC_URI[sha256sum] =
b645878135cb620c6c417c5601bfe96172245af12045540d7344938b4c2cd805
+SRC_URI[md5sum] = 9f4cd592a5efc7e36481d8d8d8af6d16
+SRC_URI[sha256sum] =
380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076
DEPENDS = groff-native
DEPENDS_class-native =
@@ -34,10 +34,18 @@ do_configure_prepend() {
fi
}
+do_configure_append() {
+# generate gnulib configure script
+olddir=`pwd`
+cd ${S}/src/libs/gnulib/
+ACLOCAL=$ACLOCAL autoreconf -Wcross --verbose --install --force
${EXTRA_AUTORECONF} $acpaths || bbfatal autoreconf execution failed.
+cd ${olddir}
+}
+
do_install_append() {
# Some distros have both /bin/perl and /usr/bin/perl, but we set perl
location
# for target as /usr/bin/perl, so fix it to /usr/bin/perl.
- for i in afmtodit mmroff; do
+ for i in afmtodit mmroff gropdf pdfmom; do
if [ -f ${D}${bindir}/$i ]; then
sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,'
${D}${bindir}/$i
fi
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] groff: upgrade to 1.22.2
- add code for generating the gnulib configure script
- replace /usr/bin/perl with /usr/bin/env perl
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../groff/{groff_1.20.1.bb = groff_1.22.2.bb} | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
rename meta/recipes-extended/groff/{groff_1.20.1.bb = groff_1.22.2.bb} (85%)
diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb
b/meta/recipes-extended/groff/groff_1.22.2.bb
similarity index 85%
rename from meta/recipes-extended/groff/groff_1.20.1.bb
rename to meta/recipes-extended/groff/groff_1.22.2.bb
index 157365b..dc40784 100644
--- a/meta/recipes-extended/groff/groff_1.20.1.bb
+++ b/meta/recipes-extended/groff/groff_1.22.2.bb
@@ -4,7 +4,7 @@ formatting commands and produces formatted output.
SECTION = base
HOMEPAGE = ftp://ftp.gnu.org/gnu/groff/;
LICENSE = GPLv2
-PR = r2
+PR = r0
LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504
@@ -34,10 +34,18 @@ do_configure_prepend() {
fi
}
+do_configure_append() {
+# generate gnulib configure script
+olddir=`pwd`
+cd ${S}/src/libs/gnulib/
+ACLOCAL=$ACLOCAL autoreconf -Wcross --verbose --install --force
${EXTRA_AUTORECONF} $acpaths || bbfatal autoreconf execution failed.
+cd ${olddir}
+}
+
do_install_append() {
# Some distros have both /bin/perl and /usr/bin/perl, but we set perl
location
# for target as /usr/bin/perl, so fix it to /usr/bin/perl.
- for i in afmtodit mmroff; do
+ for i in afmtodit mmroff gropdf pdfmom; do
if [ -f ${D}${bindir}/$i ]; then
sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,'
${D}${bindir}/$i
fi
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cairo: upgrade to 1.12.14
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-graphics/cairo/{cairo_1.12.12.bb = cairo_1.12.14.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/cairo/{cairo_1.12.12.bb = cairo_1.12.14.bb} (92%)
diff --git a/meta/recipes-graphics/cairo/cairo_1.12.12.bb
b/meta/recipes-graphics/cairo/cairo_1.12.14.bb
similarity index 92%
rename from meta/recipes-graphics/cairo/cairo_1.12.12.bb
rename to meta/recipes-graphics/cairo/cairo_1.12.14.bb
index 7bf2b82..16f9d7b 100644
--- a/meta/recipes-graphics/cairo/cairo_1.12.12.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.12.14.bb
@@ -6,8 +6,8 @@ PR = r0
SRC_URI = http://cairographics.org/releases/cairo-${PV}.tar.xz;
-SRC_URI[md5sum] = 9f7315e54885c735dcfdabe77f322d30
-SRC_URI[sha256sum] =
14f693759ecc87472355ae8f0c34731a8578b408b607cfd0b5d34331ff05d81a
+SRC_URI[md5sum] = 27b634113d0f52152d60ae8e2ec7daa7
+SRC_URI[sha256sum] =
96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13
PACKAGES =+ cairo-gobject cairo-script-interpreter cairo-perf-utils
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] shared-mime-info: upgrade to 1.1
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../{shared-mime-info_1.0.bb = shared-mime-info_1.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/shared-mime-info/{shared-mime-info_1.0.bb =
shared-mime-info_1.1.bb} (45%)
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb
b/meta/recipes-support/shared-mime-info/shared-mime-info_1.1.bb
similarity index 45%
rename from meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb
rename to meta/recipes-support/shared-mime-info/shared-mime-info_1.1.bb
index d9b7b51..301cf27 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_1.1.bb
@@ -1,8 +1,8 @@
require shared-mime-info.inc
PR = r0
-SRC_URI[md5sum] = 901b7977dbb2b71d12d30d4d8fb97028
-SRC_URI[sha256sum] =
d2e830e5aae213dd906e64495e9618cc4ef40d7b249e0971a190b04d5802ae8f
+SRC_URI[md5sum] = 12ba00bf1cb2e69bfba73127e708e833
+SRC_URI[sha256sum] =
184d094b157a9ec2607ad26a1a1837e6e07f3fcbeb38d8b6d412906156f9e06c
SRC_URI =+ file://parallelmake.patch \
file://install-data-hook.patch
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] augeas: upgrade to 1.0.0
0001-Add-missing-argument-to-escape.patch: removed
- included in the new version
remove-gets.patch: not needed anymore
add-missing-argz-conditional.patch: added
- the Makefiles assume that the argz conditional
is present in configure.ac
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-extended/augeas/augeas.inc| 2 +-
.../0001-Add-missing-argument-to-escape.patch | 29 -
...ts.patch = add-missing-argz-conditional.patch} | 30 +++---
meta/recipes-extended/augeas/augeas_0.10.0.bb | 8 --
meta/recipes-extended/augeas/augeas_1.0.0.bb | 6 +
5 files changed, 22 insertions(+), 53 deletions(-)
delete mode 100644
meta/recipes-extended/augeas/augeas/0001-Add-missing-argument-to-escape.patch
rename meta/recipes-extended/augeas/augeas/{remove-gets.patch =
add-missing-argz-conditional.patch} (12%)
delete mode 100644 meta/recipes-extended/augeas/augeas_0.10.0.bb
create mode 100644 meta/recipes-extended/augeas/augeas_1.0.0.bb
diff --git a/meta/recipes-extended/augeas/augeas.inc
b/meta/recipes-extended/augeas/augeas.inc
index 479fb97..a0aa9dd 100644
--- a/meta/recipes-extended/augeas/augeas.inc
+++ b/meta/recipes-extended/augeas/augeas.inc
@@ -6,7 +6,7 @@ LICENSE = LGPLv2.1+
LIC_FILES_CHKSUM = file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff
SRC_URI = http://augeas.net/download/${BP}.tar.gz \
- file://0001-Add-missing-argument-to-escape.patch \
+ file://add-missing-argz-conditional.patch \
DEPENDS = readline libxml2
diff --git
a/meta/recipes-extended/augeas/augeas/0001-Add-missing-argument-to-escape.patch
b/meta/recipes-extended/augeas/augeas/0001-Add-missing-argument-to-escape.patch
deleted file mode 100644
index 3d0d0e3..000
---
a/meta/recipes-extended/augeas/augeas/0001-Add-missing-argument-to-escape.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Khem Raj raj.k...@gmail.com
-
-From 021ea39f8e400225e2d01b4c62eb9d56404f2ecd Mon Sep 17 00:00:00 2001
-From: Michael Chapman m...@very.puzzling.org
-Date: Fri, 16 Dec 2011 21:30:07 +1100
-Subject: [PATCH] Add missing argument to escape()
-
-Fixes ticket #242.
- src/regexp.c |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/regexp.c b/src/regexp.c
-index cf0ea5d..811087d 100644
a/src/regexp.c
-+++ b/src/regexp.c
-@@ -50,7 +50,7 @@ char *regexp_escape(const struct regexp *r) {
- ret = fa_restrict_alphabet(r-pattern-str, strlen(r-pattern-str),
-nre, nre_len, 2, 1);
- if (ret == 0) {
--pat = escape(nre, nre_len);
-+pat = escape(nre, nre_len, RX_ESCAPES);
- free(nre);
- }
- #endif
---
-1.7.5.4
-
diff --git a/meta/recipes-extended/augeas/augeas/remove-gets.patch
b/meta/recipes-extended/augeas/augeas/add-missing-argz-conditional.patch
similarity index 12%
rename from meta/recipes-extended/augeas/augeas/remove-gets.patch
rename to meta/recipes-extended/augeas/augeas/add-missing-argz-conditional.patch
index bd6e92c..abbdbaa 100644
--- a/meta/recipes-extended/augeas/augeas/remove-gets.patch
+++ b/meta/recipes-extended/augeas/augeas/add-missing-argz-conditional.patch
@@ -1,20 +1,20 @@
-eglibc 2.16 has remove gets so check for it to be there before using it
+Add missing GL_GENERATE_ARGZ_H conditional
-Signed-off-by: Khem Raj raj.k...@gmail.com
+- GL_GENERATE_ARGZ_H is used in gnulib/lib/Makefile.am
Upstream-Status: Pending
-Index: augeas-0.10.0/gnulib/lib/stdio.in.h
+Signed-off-by: Constantin Musca constantinx.mu...@intel.com
+
+Index: augeas-1.0.0/configure.ac
===
augeas-0.10.0.orig/gnulib/lib/stdio.in.h 2011-03-03 17:07:59.0
-0800
-+++ augeas-0.10.0/gnulib/lib/stdio.in.h2012-07-03 19:46:42.871894833
-0700
-@@ -161,8 +161,10 @@
- /* It is very rare that the developer ever has full control of stdin,
-so any use of gets warrants an unconditional warning. Assume it is
-always declared, since it is required by C89. */
-+#if defined gets
- #undef gets
- _GL_WARN_ON_USE (gets, gets is a security hole - use fgets instead);
-+#endif
+--- augeas-1.0.0.orig/configure.ac
augeas-1.0.0/configure.ac
+@@ -55,6 +55,8 @@ AC_ARG_WITH([failmalloc],
+
+ AM_CONDITIONAL([WITH_FAILMALLOC], [test x$with_failmalloc != xno])
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
++AM_CONDITIONAL([GL_GENERATE_ARGZ_H], [test -n $ARGZ_H])
++
+ dnl --enable-debug=(yes|no)
+ AC_ARG_ENABLE([debug],
+ [AC_HELP_STRING([--enable-debug=no/yes],
diff --git a/meta/recipes-extended/augeas/augeas_0.10.0.bb
b/meta/recipes-extended/augeas/augeas_0.10.0.bb
deleted file mode 100644
index 0840428..000
--- a/meta/recipes-extended/augeas/augeas_0.10.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require augeas.inc
-
-SRC_URI += file://remove-gets.patch \
-
-PR = r3
-
-SRC_URI[md5sum
[OE-core] [PATCH] gdk-pixbuf: upgrade to 2.27.1
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../{gdk-pixbuf-2.26.5 = gdk-pixbuf-2.27.1}/configure_fix.patch | 0
.../extending-libinstall-dependencies.patch | 0
.../hardcoded_libtool.patch | 0
.../gdk-pixbuf/{gdk-pixbuf_2.26.5.bb = gdk-pixbuf_2.27.1.bb} | 8
4 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf-2.26.5 =
gdk-pixbuf-2.27.1}/configure_fix.patch (100%)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf-2.26.5 =
gdk-pixbuf-2.27.1}/extending-libinstall-dependencies.patch (100%)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf-2.26.5 =
gdk-pixbuf-2.27.1}/hardcoded_libtool.patch (100%)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.26.5.bb =
gdk-pixbuf_2.27.1.bb} (93%)
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/configure_fix.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.27.1/configure_fix.patch
similarity index 100%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/configure_fix.patch
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.27.1/configure_fix.patch
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/extending-libinstall-dependencies.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.27.1/extending-libinstall-dependencies.patch
similarity index 100%
rename from
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/extending-libinstall-dependencies.patch
rename to
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.27.1/extending-libinstall-dependencies.patch
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/hardcoded_libtool.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.27.1/hardcoded_libtool.patch
similarity index 100%
rename from
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/hardcoded_libtool.patch
rename to
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.27.1/hardcoded_libtool.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.27.1.bb
similarity index 93%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.27.1.bb
index cc2ea50..252ac78 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.27.1.bb
@@ -11,16 +11,16 @@ SECTION = libs
DEPENDS = libpng glib-2.0 jpeg
DEPENDS_append_linuxstdbase = virtual/libx11
-SRC_URI =
http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-${PV}.tar.xz
\
+SRC_URI =
http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.27/gdk-pixbuf-${PV}.tar.xz
\
file://hardcoded_libtool.patch \
file://configure_fix.patch \
file://extending-libinstall-dependencies.patch \
-SRC_URI[md5sum] = 339329e6d619ee3e1cb93979111b04c0
-SRC_URI[sha256sum] =
77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84
+SRC_URI[md5sum] = 8ea172466dc3ead706130981e88c219b
+SRC_URI[sha256sum] =
028f95552203e522429e3248ff97a433c63c9a57143f10265e7ce48c2bea02b4
-PR = r1
+PR = r0
inherit autotools pkgconfig gettext pixbufcache
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gnome-common: upgrade to 3.7.4
- gnome-common finally is GPLv2+
- omf.patch is included in the new version
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch| 15 ---
.../{gnome-common_2.28.0.bb = gnome-common_3.7.4.bb} | 10 +-
2 files changed, 5 insertions(+), 20 deletions(-)
delete mode 100644 meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
rename meta/recipes-gnome/gnome/{gnome-common_2.28.0.bb =
gnome-common_3.7.4.bb} (59%)
diff --git a/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
b/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
deleted file mode 100644
index 0f9b13c..000
--- a/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
gnome-common-2.4.0/doc-build/omf.make 2003-05-24 08:16:25.0
-0700
-+++ gnome-common-2.4.0.new/doc-build/omf.make 2004-11-15 14:01:12.185155192
-0700
-@@ -43,7 +43,9 @@
- install-data-hook-omf:
- $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- for file in $(omffile); do \
-- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+ if [ -f $$file.out ]; then \
-+ $(INSTALL_DATA) $$file.out
$(DESTDIR)$(omf_dest_dir)/$$file; \
-+ fi; \
- done
- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir)
-
diff --git a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
b/meta/recipes-gnome/gnome/gnome-common_3.7.4.bb
similarity index 59%
rename from meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
rename to meta/recipes-gnome/gnome/gnome-common_3.7.4.bb
index e094ccf..7f8d49d 100644
--- a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-common_3.7.4.bb
@@ -3,19 +3,19 @@ HOMEPAGE = http://www.gnome.org/;
BUGTRACKER = https://bugzilla.gnome.org/;
LICENSE = GPLv2+
-LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504
+LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
SECTION = x11/gnome
-PR = r3
+PR = r0
inherit gnome allarch
# The omf.make file failed if scrollkeeper doesn't happen to be
# installed
-SRC_URI += file://omf.patch
+GNOME_COMPRESS_TYPE = xz
-SRC_URI[archive.md5sum] = 30daabb0ca4898fea2647999e7813e8f
-SRC_URI[archive.sha256sum] =
dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1
+SRC_URI[archive.md5sum] = 974cd54626f1d1787481288ef26bd4ba
+SRC_URI[archive.sha256sum] =
2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b
EXTRA_AUTORECONF =
DEPENDS =
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] gnome-common: upgrade to 3.7.4
- gnome-common finally is GPLv2+
- omf.patch is included in the new version
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch| 15 ---
.../{gnome-common_2.28.0.bb = gnome-common_3.7.4.bb} | 13 +
2 files changed, 5 insertions(+), 23 deletions(-)
delete mode 100644 meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
rename meta/recipes-gnome/gnome/{gnome-common_2.28.0.bb =
gnome-common_3.7.4.bb} (48%)
diff --git a/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
b/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
deleted file mode 100644
index 0f9b13c..000
--- a/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
gnome-common-2.4.0/doc-build/omf.make 2003-05-24 08:16:25.0
-0700
-+++ gnome-common-2.4.0.new/doc-build/omf.make 2004-11-15 14:01:12.185155192
-0700
-@@ -43,7 +43,9 @@
- install-data-hook-omf:
- $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- for file in $(omffile); do \
-- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+ if [ -f $$file.out ]; then \
-+ $(INSTALL_DATA) $$file.out
$(DESTDIR)$(omf_dest_dir)/$$file; \
-+ fi; \
- done
- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir)
-
diff --git a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
b/meta/recipes-gnome/gnome/gnome-common_3.7.4.bb
similarity index 48%
rename from meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
rename to meta/recipes-gnome/gnome/gnome-common_3.7.4.bb
index e094ccf..ebf343e 100644
--- a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-common_3.7.4.bb
@@ -3,19 +3,16 @@ HOMEPAGE = http://www.gnome.org/;
BUGTRACKER = https://bugzilla.gnome.org/;
LICENSE = GPLv2+
-LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504
+LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
SECTION = x11/gnome
-PR = r3
+PR = r0
inherit gnome allarch
-# The omf.make file failed if scrollkeeper doesn't happen to be
-# installed
+GNOME_COMPRESS_TYPE = xz
-SRC_URI += file://omf.patch
-
-SRC_URI[archive.md5sum] = 30daabb0ca4898fea2647999e7813e8f
-SRC_URI[archive.sha256sum] =
dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1
+SRC_URI[archive.md5sum] = 974cd54626f1d1787481288ef26bd4ba
+SRC_URI[archive.sha256sum] =
2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b
EXTRA_AUTORECONF =
DEPENDS =
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] jpeg: upgrade to 9
License checksum change due to:
- version modification
- links modification
- additional license explanations
fix_for_automake_1.12.1.patch: not needed anymore
fix-jmorecfg-boolean-enum.patch: added
- we have to undef TRUE FALSE in order to define
the boolean enum
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../jpeg/jpeg-8d/fix_for_automake_1.12.1.patch | 44 --
.../{jpeg-8d = jpeg-9}/debian-libjpeg7_7-1.diff | 0
.../jpeg/jpeg-9/fix-jmorecfg-boolean-enum.patch| 19 ++
meta/recipes-core/jpeg/{jpeg_8d.bb = jpeg_9.bb} | 12 +++---
4 files changed, 25 insertions(+), 50 deletions(-)
delete mode 100644 meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
rename meta/recipes-core/jpeg/{jpeg-8d = jpeg-9}/debian-libjpeg7_7-1.diff
(100%)
create mode 100644
meta/recipes-core/jpeg/jpeg-9/fix-jmorecfg-boolean-enum.patch
rename meta/recipes-core/jpeg/{jpeg_8d.bb = jpeg_9.bb} (81%)
diff --git a/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
b/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
deleted file mode 100644
index 3a970ea..000
--- a/meta/recipes-core/jpeg/jpeg-8d/fix_for_automake_1.12.1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Upstream-Status: Pending
-
-The support for automatic de-ANSI-fication has been deprecated in
-automake 1.11.2, and will be removed altogether in automake 1.12
-
-This avoids this error:
-| configure.ac:24: automatic de-ANSI-fication support is deprecated
-| autoreconf: automake failed with exit status: 1
-| ERROR: autoreconf execution failed.
-NOTE: package jpeg-native-8c-r2: task do_configure: Failed
-
-Signed-Off-By: Nitin A Kamble nitin.a.kam...@intel.com
-2011/12/28
-
-
-Index: jpeg-8d/configure.ac
-===
jpeg-8d.orig/configure.ac
-+++ jpeg-8d/configure.ac
-@@ -21,7 +21,7 @@ AC_CANONICAL_TARGET
-
- # Initialize Automake
- # Don't require all the GNU mandated files
--AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete ansi2knr no-dist foreign])
-+AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obsolete no-dist foreign])
-
- # Make --enable-silent-rules the default.
- # To get verbose build output you may configure
-@@ -29,7 +29,14 @@ AM_INIT_AUTOMAKE([-Wall -Werror -Wno-obs
- AM_SILENT_RULES([yes])
-
- # This is required when using the de-ANSI-fication feature.
--AM_C_PROTOTYPES
-+#AM_C_PROTOTYPES
-+# add following to avoid this error:
-+#| automake: warnings are treated as errors
-+#|
/srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am:
warning: 'libjpeg.la': linking libtool libraries using a non-POSIX
-+#|
/srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am:
archiver requires 'AM_PROG_AR' in 'configure.ac'
-+#| Makefile.am:65: while processing Libtool library 'libjpeg.la'
-+#| autoreconf: automake failed with exit status: 1
-+AM_PROG_AR
-
- # Add configure option --enable-maintainer-mode which enables
- # dependency checking and generation useful to package maintainers.
diff --git a/meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff
b/meta/recipes-core/jpeg/jpeg-9/debian-libjpeg7_7-1.diff
similarity index 100%
rename from meta/recipes-core/jpeg/jpeg-8d/debian-libjpeg7_7-1.diff
rename to meta/recipes-core/jpeg/jpeg-9/debian-libjpeg7_7-1.diff
diff --git a/meta/recipes-core/jpeg/jpeg-9/fix-jmorecfg-boolean-enum.patch
b/meta/recipes-core/jpeg/jpeg-9/fix-jmorecfg-boolean-enum.patch
new file mode 100644
index 000..089eb1d
--- /dev/null
+++ b/meta/recipes-core/jpeg/jpeg-9/fix-jmorecfg-boolean-enum.patch
@@ -0,0 +1,19 @@
+TRUE FALSE have to be undefined in order to define
+the boolean enum
+
+Upstream-Status: Pending
+Signed-off-by: Constantin Musca constantinx.mu...@intel.com
+
+Index: jpeg-9/jmorecfg.h
+===
+--- jpeg-9.orig/jmorecfg.h
jpeg-9/jmorecfg.h
+@@ -260,6 +260,8 @@ typedef void noreturn_t;
+ #define TRUE 1
+ #endif
+ #else
++#undef TRUE
++#undef FALSE
+ typedef enum { FALSE = 0, TRUE = 1 } boolean;
+ #endif
+
diff --git a/meta/recipes-core/jpeg/jpeg_8d.bb
b/meta/recipes-core/jpeg/jpeg_9.bb
similarity index 81%
rename from meta/recipes-core/jpeg/jpeg_8d.bb
rename to meta/recipes-core/jpeg/jpeg_9.bb
index eba5bf4..8d0f541 100644
--- a/meta/recipes-core/jpeg/jpeg_8d.bb
+++ b/meta/recipes-core/jpeg/jpeg_9.bb
@@ -4,21 +4,21 @@ HOMEPAGE = http://www.ijg.org/;
BUGTRACKER =
LICENSE =BSD-3-Clause
-LIC_FILES_CHKSUM = file://README;md5=4f46756b064c225fae088903300e5c98
+LIC_FILES_CHKSUM = file://README;md5=c7b449f4c8fb865866a8fc0231431526
SECTION = libs
DEPENDS = libtool-cross
DEPENDS_class-native = libtool-native
-PR = r1
+PR = r0
SRC_URI = http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
- file://debian-libjpeg7_7-1.diff \
- file://fix_for_automake_1.12.1.patch
+ file://debian-libjpeg7_7-1.diff
Re: [OE-core] [PATCH] qemu: upgrade to 1.3.1
On 02/11/2013 07:46 PM, Saul Wold wrote:
qhat kind of testing have you done with this update, since qemu is
core to our BSPs I want to make sure we have tested it well.
I have tested core-image-sato on all qemu archs.
Cheers,
Constantin
Thanks
Sau!
On 02/11/2013 05:01 AM, Constantin Musca wrote:
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/qemu/{qemu_1.3.0.bb = qemu_1.3.1.bb} | 4 ++--
meta/recipes-devtools/qemu/qemu_git.bb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/qemu/{qemu_1.3.0.bb = qemu_1.3.1.bb}
(64%)
diff --git a/meta/recipes-devtools/qemu/qemu_1.3.0.bb
b/meta/recipes-devtools/qemu/qemu_1.3.1.bb
similarity index 64%
rename from meta/recipes-devtools/qemu/qemu_1.3.0.bb
rename to meta/recipes-devtools/qemu/qemu_1.3.1.bb
index 7d007ea..c04b2be 100644
--- a/meta/recipes-devtools/qemu/qemu_1.3.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_1.3.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913
SRC_URI_prepend = http://wiki.qemu.org/download/qemu-${PV}.tar.bz2;
-SRC_URI[md5sum] = a4030ddd2ba324152a97d65d3c0b247d
-SRC_URI[sha256sum] =
878055ec05bc28fecfe2da97eb8bc992e8635575b67cebdfc5ca1ede171140a8
+SRC_URI[md5sum] = 5dbc6c22f47efca71dfaae0dd80dcf9e
+SRC_URI[sha256sum] =
3772e7ef0c9b4178195edcf90e711f12ba123f465fcf09fb43b56bdacaca0eaf
PR = r0
diff --git a/meta/recipes-devtools/qemu/qemu_git.bb
b/meta/recipes-devtools/qemu/qemu_git.bb
index 9465203..328e3bf 100644
--- a/meta/recipes-devtools/qemu/qemu_git.bb
+++ b/meta/recipes-devtools/qemu/qemu_git.bb
@@ -1,6 +1,6 @@
require qemu.inc
-SRCREV = 6d6c9f59ca1b1a76ade7ad868bef191818f58819
+SRCREV = 04024dea2674861fcf13582a77b58130c67fccd8
LIC_FILES_CHKSUM =
file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cairo: upgrade to 1.12.12
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-graphics/cairo/{cairo_1.12.10.bb = cairo_1.12.12.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/cairo/{cairo_1.12.10.bb = cairo_1.12.12.bb} (92%)
diff --git a/meta/recipes-graphics/cairo/cairo_1.12.10.bb
b/meta/recipes-graphics/cairo/cairo_1.12.12.bb
similarity index 92%
rename from meta/recipes-graphics/cairo/cairo_1.12.10.bb
rename to meta/recipes-graphics/cairo/cairo_1.12.12.bb
index 00c0377..7bf2b82 100644
--- a/meta/recipes-graphics/cairo/cairo_1.12.10.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.12.12.bb
@@ -6,8 +6,8 @@ PR = r0
SRC_URI = http://cairographics.org/releases/cairo-${PV}.tar.xz;
-SRC_URI[md5sum] = bddd5c5b734ab4b9683eb0ba363070d4
-SRC_URI[sha256sum] =
f1581aef210f6caa9cf42875fb66ab3b47a32db9436bdfa9913b9bbd5034b03b
+SRC_URI[md5sum] = 9f7315e54885c735dcfdabe77f322d30
+SRC_URI[sha256sum] =
14f693759ecc87472355ae8f0c34731a8578b408b607cfd0b5d34331ff05d81a
PACKAGES =+ cairo-gobject cairo-script-interpreter cairo-perf-utils
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mesa: upgrade to 9.0.2
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-graphics/mesa/{mesa-9.0.1.inc = mesa-9.0.2.inc} | 4 ++--
meta/recipes-graphics/mesa/{mesa-dri_9.0.1.bb = mesa-dri_9.0.2.bb} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-9.0.1.inc = mesa-9.0.2.inc} (66%)
rename meta/recipes-graphics/mesa/{mesa-dri_9.0.1.bb = mesa-dri_9.0.2.bb}
(100%)
diff --git a/meta/recipes-graphics/mesa/mesa-9.0.1.inc
b/meta/recipes-graphics/mesa/mesa-9.0.2.inc
similarity index 66%
rename from meta/recipes-graphics/mesa/mesa-9.0.1.inc
rename to meta/recipes-graphics/mesa/mesa-9.0.2.inc
index 9b639da..bed432c 100644
--- a/meta/recipes-graphics/mesa/mesa-9.0.1.inc
+++ b/meta/recipes-graphics/mesa/mesa-9.0.2.inc
@@ -3,8 +3,8 @@ SRC_URI =
ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://cross-glsl.patch \
-SRC_URI[md5sum] = 97d6554c05ea7449398afe3a0ede7018
-SRC_URI[sha256sum] =
57a7ba83bace3f3a7dc0929fe026ef5f0ad454234ec4ad8a3e0d31650a75db6f
+SRC_URI[md5sum] = dc45d1192203e418163e0017640e1cfc
+SRC_URI[sha256sum] =
75bf31f26c6e7b5515e610c1005fd1be1f7eeb2c9e6859848dab879c355ad64e
LIC_FILES_CHKSUM =
file://docs/license.html;md5=012f69938d81b766472fd0d240df38a4
diff --git a/meta/recipes-graphics/mesa/mesa-dri_9.0.1.bb
b/meta/recipes-graphics/mesa/mesa-dri_9.0.2.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri_9.0.1.bb
rename to meta/recipes-graphics/mesa/mesa-dri_9.0.2.bb
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qemu: upgrade to 1.3.1
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/qemu/{qemu_1.3.0.bb = qemu_1.3.1.bb} | 4 ++--
meta/recipes-devtools/qemu/qemu_git.bb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/qemu/{qemu_1.3.0.bb = qemu_1.3.1.bb} (64%)
diff --git a/meta/recipes-devtools/qemu/qemu_1.3.0.bb
b/meta/recipes-devtools/qemu/qemu_1.3.1.bb
similarity index 64%
rename from meta/recipes-devtools/qemu/qemu_1.3.0.bb
rename to meta/recipes-devtools/qemu/qemu_1.3.1.bb
index 7d007ea..c04b2be 100644
--- a/meta/recipes-devtools/qemu/qemu_1.3.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_1.3.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913
SRC_URI_prepend = http://wiki.qemu.org/download/qemu-${PV}.tar.bz2;
-SRC_URI[md5sum] = a4030ddd2ba324152a97d65d3c0b247d
-SRC_URI[sha256sum] =
878055ec05bc28fecfe2da97eb8bc992e8635575b67cebdfc5ca1ede171140a8
+SRC_URI[md5sum] = 5dbc6c22f47efca71dfaae0dd80dcf9e
+SRC_URI[sha256sum] =
3772e7ef0c9b4178195edcf90e711f12ba123f465fcf09fb43b56bdacaca0eaf
PR = r0
diff --git a/meta/recipes-devtools/qemu/qemu_git.bb
b/meta/recipes-devtools/qemu/qemu_git.bb
index 9465203..328e3bf 100644
--- a/meta/recipes-devtools/qemu/qemu_git.bb
+++ b/meta/recipes-devtools/qemu/qemu_git.bb
@@ -1,6 +1,6 @@
require qemu.inc
-SRCREV = 6d6c9f59ca1b1a76ade7ad868bef191818f58819
+SRCREV = 04024dea2674861fcf13582a77b58130c67fccd8
LIC_FILES_CHKSUM = file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] multilib.bbclass: save multilib variables before executing the gcc-cross-canadian statements
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/classes/multilib.bbclass | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index f1696b6..a999b69 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -15,6 +15,12 @@ python multilib_virtclass_handler () {
if virtual/kernel in provides or bb.data.inherits_class('module-base',
e.data):
raise bb.parse.SkipPackage(We shouldn't have multilib variants for
the kernel)
+save_var_name=e.data.getVar(MULTILIB_SAVE_VARNAME, True) or
+for name in save_var_name.split():
+val=e.data.getVar(name, True)
+if val:
+e.data.setVar(name + _MULTILIB_ORIGINAL, val)
+
if bb.data.inherits_class('image', e.data):
e.data.setVar(MLPREFIX, variant + -)
e.data.setVar(PN, variant + - + e.data.getVar(PN, False))
@@ -36,11 +42,6 @@ python multilib_virtclass_handler () {
if bb.data.inherits_class('allarch', e.data) and not
bb.data.inherits_class('packagegroup', e.data):
raise bb.parse.SkipPackage(Don't extend allarch recipes which are not
packagegroups)
-save_var_name=e.data.getVar(MULTILIB_SAVE_VARNAME, True) or
-for name in save_var_name.split():
-val=e.data.getVar(name, True)
-if val:
-e.data.setVar(name + _MULTILIB_ORIGINAL, val)
# Expand this since this won't work correctly once we set a multilib into
place
e.data.setVar(ALL_MULTILIB_PACKAGE_ARCHS,
e.data.getVar(ALL_MULTILIB_PACKAGE_ARCHS, True))
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] gcc-cross-canadian: enable multilib support
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +-
meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 1 +
meta/recipes-devtools/gcc/gcc-multilib-config.inc | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 991f37c..8735e48 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = r17
+PR = r18
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.7.1
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index f1824fa..10ddacf 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -6,3 +6,4 @@ BPN = gcc
DEPENDS = virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}binutils-crosssdk
virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext
+GCCMULTILIB = --enable-multilib
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
index 9403aab..f89aa8e 100644
--- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
+++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
@@ -41,7 +41,8 @@ python gcc_multilib_setup() {
return
mlprefix = d.getVar('MLPREFIX', True)
-if ('%sgcc' % mlprefix) != d.getVar('PN', True):
+pn = d.getVar('PN', True)
+if ('%sgcc' % mlprefix) != pn and (not
pn.startswith('gcc-cross-canadian')):
return
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libgcc: Disable multilib install for nativesdk
From: Khem Raj raj.k...@gmail.com
Fixes errors when building SDK for multilibbed enabled
architectures.
[YOCTO #3832]
Signed-off-by: Khem Raj raj.k...@gmail.com
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +-
meta/recipes-devtools/gcc/libgcc_4.7.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 2dc81f0..991f37c 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = r16
+PR = r17
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.7.1
diff --git a/meta/recipes-devtools/gcc/libgcc_4.7.bb
b/meta/recipes-devtools/gcc/libgcc_4.7.bb
index 550a3c9..47669a2 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.7.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.7.bb
@@ -86,7 +86,7 @@ python do_multilib_install() {
import re
multilibs = d.getVar('MULTILIB_VARIANTS', True)
-if not multilibs:
+if not multilibs or bb.data.inherits_class('nativesdk', d):
return
binv = d.getVar('BINV', True)
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] classextend.py: use explode_dep_versions2 in order to preserve versions too
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/lib/oe/classextend.py | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py
index 61cbb8f..c37a896 100644
--- a/meta/lib/oe/classextend.py
+++ b/meta/lib/oe/classextend.py
@@ -63,11 +63,12 @@ class ClassExtender(object):
deps = self.d.getVar(varname, True)
if not deps:
return
-deps = bb.utils.explode_deps(deps)
-newdeps = []
+deps = bb.utils.explode_dep_versions2(deps)
+newdeps = {}
for dep in deps:
-newdeps.append(self.map_depends(dep))
-self.d.setVar(varname, .join(newdeps))
+newdeps[self.map_depends(dep)] = deps[dep]
+
+self.d.setVar(varname, bb.utils.join_deps(newdeps, False))
def map_packagevars(self):
for pkg in (self.d.getVar(PACKAGES, True).split() + []):
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/10] Multilib fixes
This represents a set of patches that address multilib issues and other
problems discovered building lib32 world
The following changes since commit 75f470cd18d693a9a96d9849291c2c8de4dcbeb8:
qt4: Add space for _appends (2013-02-01 22:49:47 +)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib cmuscax/ml_patches
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/ml_patches
Constantin Musca (10):
enchant: use BPN instead of PN
sgml-common: use ${PN} instead of sgml-common
syslinux: use BPN instead of PN
console-tools: fix linking when using the multilib compiler
foomatic-filters: fix CUPS directory config
taglib: use LIB_SUFFIX in order to determine the correct baselib
run-postinsts: use BPN instead of PN
consolekit: add arch independent unpackaged files
gcc: target: fix libiberty removal
blktool: fix SRC_URI typo
.../fix-libconsole-linking.patch | 56 ++
.../console-tools/console-tools_0.3.2.bb | 3 +-
meta/recipes-devtools/dpkg/run-postinsts_1.0.bb| 6 +--
meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +-
meta/recipes-devtools/gcc/gcc-package-target.inc | 4 +-
.../sgml-common/sgml-common_0.6.3.bb | 4 +-
meta/recipes-devtools/syslinux/syslinux_4.03.bb| 16 +++
meta/recipes-extended/blktool/blktool_4-6.1.bb | 4 +-
.../foomatic/foomatic-filters_4.0.17.bb| 7 +--
.../recipes-support/consolekit/consolekit_0.4.5.bb | 6 ++-
meta/recipes-support/enchant/enchant_1.6.0.bb | 8 ++--
meta/recipes-support/taglib/taglib_1.8.bb | 4 +-
12 files changed, 89 insertions(+), 31 deletions(-)
create mode 100644
meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/10] enchant: use BPN instead of PN
- use BPN (PN includes mlprefix) to package all files
when building with multilib options
[YOCTO #3438]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-support/enchant/enchant_1.6.0.bb | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-support/enchant/enchant_1.6.0.bb
b/meta/recipes-support/enchant/enchant_1.6.0.bb
index 25178f5..c16a2a8 100644
--- a/meta/recipes-support/enchant/enchant_1.6.0.bb
+++ b/meta/recipes-support/enchant/enchant_1.6.0.bb
@@ -10,7 +10,7 @@ RDEPENDS_${PN}= aspell
inherit autotools pkgconfig
-PR = r2
+PR = r3
SRC_URI =
http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz;
@@ -19,8 +19,8 @@ SRC_URI[sha256sum] =
2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03
EXTRA_OECONF = --with-aspell-prefix=${STAGING_DIR_HOST}${prefix}
--enable-aspell --disable-binreloc
-FILES_${PN} = ${bindir} ${libdir}/*${SOLIBS} ${datadir}/${PN}
${libdir}/${PN}/*.so
-FILES_${PN}-dev += ${libdir}/${PN}/*{SOLIBSDEV} ${libdir}/${PN}/*.la
-FILES_${PN}-staticdev += ${libdir}/${PN}/*.a
+FILES_${PN} = ${bindir} ${libdir}/*${SOLIBS} ${datadir}/${BPN}
${libdir}/${BPN}/*.so
+FILES_${PN}-dev += ${libdir}/${BPN}/*{SOLIBSDEV} ${libdir}/${BPN}/*.la
+FILES_${PN}-staticdev += ${libdir}/${BPN}/*.a
export CXXFLAGS += -L${STAGING_LIBDIR} -lstdc++
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/10] console-tools: fix linking when using the multilib compiler
fix-libconsole-link.patch: add patch for fixing libconsole
linking problems when using multilib gcc
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../fix-libconsole-linking.patch | 56 ++
.../console-tools/console-tools_0.3.2.bb | 3 +-
2 files changed, 58 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
diff --git
a/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
b/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
new file mode 100644
index 000..be61eb8
--- /dev/null
+++
b/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
@@ -0,0 +1,56 @@
+Fix the following error detected with i586-pokymllib32-linux-gcc (the
+multilib x86-64 lib32 compiler):
+../lib/ctutils/.libs/libctutils.so: undefined reference to `get_kernel_sfm'
+collect2: error: ld returned 1 exit status
+
+It seems that libctutils.so (the library that uses get_kernel_sfm) must
+be stated before libconsole.so (the library that exports the function) when
+using multilib gcc
+
+Upstream-Status: Pending
+Signed-off-by: Constantin Musca constantinx.mu...@intel.com
+
+Index: console-tools-0.3.2/fontfiletools/Makefile.am
+===
+--- console-tools-0.3.2.orig/fontfiletools/Makefile.am
console-tools-0.3.2/fontfiletools/Makefile.am
+@@ -10,5 +10,5 @@ EXTRA_DIST = fonts2virfont.c virfont.h
+
+ # libconsole is needed by ctutils
+ LDADD = ../lib/ctlocal/libctlocal.a ../lib/cfont/libcfont.la \
+- ../lib/console/libconsole.la \
+- ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la
++ ../lib/ctutils/libctutils.la \
++ ../lib/console/libconsole.la ../lib/generic/libctgeneric.la
+Index: console-tools-0.3.2/vttools/Makefile.am
+===
+--- console-tools-0.3.2.orig/vttools/Makefile.am
console-tools-0.3.2/vttools/Makefile.am
+@@ -7,9 +7,9 @@ bin_PROGRAMS = chvt deallocvt writevt fg
+ vcstime vt-is-UTF8 openvt @RESIZECONS@
+ EXTRA_PROGRAMS = resizecons
+
+-LDADD = ../lib/ctlocal/libctlocal.a ../lib/console/libconsole.la \
++LDADD = ../lib/ctlocal/libctlocal.a ../lib/ctutils/libctutils.la \
+ ../lib/cfont/libcfont.la \
+- ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la
++ ../lib/console/libconsole.la ../lib/generic/libctgeneric.la
+
+ vcstime_LDADD = ../lib/ctlocal/libctlocal.a
+ screendump_LDADD = ../lib/ctlocal/libctlocal.a
+Index: console-tools-0.3.2/kbdtools/Makefile.am
+===
+--- console-tools-0.3.2.orig/kbdtools/Makefile.am
console-tools-0.3.2/kbdtools/Makefile.am
+@@ -15,9 +15,9 @@ EXTRA_PROGRAMS = getkeycodes setkeycodes
+ loadkeys_SOURCES = loadkeys.y analyze.l
+
+ YFLAGS = -d
+-LDADD = ../lib/ctlocal/libctlocal.a ../lib/console/libconsole.la \
++LDADD = ../lib/ctlocal/libctlocal.a ../lib/ctutils/libctutils.la \
+ ../lib/cfont/libcfont.la \
+- ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la
++ ../lib/console/libconsole.la ../lib/generic/libctgeneric.la
+
+ loadkeys_LDADD = $(LDADD) @LEXLIB@
+
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index a46e44d..8f2f116 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -3,7 +3,7 @@ LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9
SUMMARY = Allows you to set-up and manipulate the Linux console.
DESCRIPTION = Provides tools that enable the set-up and manipulation of the
linux console and console-font files.
-PR = r7
+PR = r8
SRC_URI = ${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
file://codepage.patch \
@@ -12,6 +12,7 @@ SRC_URI =
${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
file://kbdrate.patch \
file://uclibc-fileno.patch \
file://nodocs.patch \
+ file://fix-libconsole-linking.patch \
file://lcmessage.m4 \
file://Makevars
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/10] sgml-common: use ${PN} instead of sgml-common
Fix the following warning:
WARNING: QA Issue: lib32-sgml-common: Files/directories were installed but not
shipped
/etc
/etc/sgml
/etc/sgml/sgml.conf
/usr/bin
/usr/bin/install-catalog
/usr/bin/sgmlwhich
[YOCTO #3438]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
b/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
index 27b1a48..4355379 100644
--- a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
+++ b/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
@@ -13,7 +13,7 @@ LICENSE = GPLv2+
LIC_FILES_CHKSUM = file://LICENSE-GPLv2;md5=ab8a50abe86dfc859e148baae043c89b
SECTION = base
-PR = r0
+PR = r1
SRC_URI =
ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-${PV}.tgz
\
file://autohell.patch \
@@ -29,7 +29,7 @@ do_compile_append() {
sed -i -e 's|\([ ]\+\)/etc/sgml|\1${sysconfdir}/sgml|g'
bin/install-catalog
}
-FILES_sgml-common_append = ${datadir}/sgml
+FILES_${PN} += ${datadir}/sgml
pkg_postinst_${PN}() {
install-catalog \
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/10] syslinux: use BPN instead of PN
Fix the following warning:
WARNING: QA Issue: lib32-syslinux: Files/directories were installed but not
shipped
/usr/lib
/usr/share/syslinux
/usr/share/syslinux/com32
/usr/share/syslinux/com32/libcom32gpl.a
/usr/share/syslinux/com32/libcom32.a
...
[YOCTO #3438]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/syslinux/syslinux_4.03.bb | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-devtools/syslinux/syslinux_4.03.bb
b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
index abf2b06..7c3ecda 100644
--- a/meta/recipes-devtools/syslinux/syslinux_4.03.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
# If you really want to run syslinux, you need mtools. We just want the
# ldlinux.* stuff for now, so skip mtools-native
DEPENDS = nasm-native
-PR = r8
+PR = r9
SRC_URI =
${KERNELORG_MIRROR}/linux/utils/boot/syslinux/4.xx/syslinux-${PV}.tar.bz2 \
file://cross-build.patch \
@@ -54,12 +54,12 @@ RDEPENDS_${PN} += mtools
FILES_${PN} = ${bindir}/syslinux
FILES_${PN}-extlinux = ${sbindir}/extlinux
-FILES_${PN}-mbr = ${libdir}/${PN}/mbr.bin
-FILES_${PN}-chain = ${libdir}/${PN}/chain.c32
-FILES_${PN}-isolinux = ${libdir}/${PN}/isolinux.bin
-FILES_${PN}-pxelinux = ${libdir}/${PN}/pxelinux.0
-FILES_${PN}-dev += ${datadir}/${PN}/com32/lib*${SOLIBS}
${datadir}/${PN}/com32/include ${datadir}/${PN}/com32/com32.ld
-FILES_${PN}-staticdev += ${datadir}/${PN}/com32/lib*.a
${libdir}/${PN}/com32/lib*.a
-FILES_${PN}-misc = ${libdir}/${PN}/* ${bindir}/*
+FILES_${PN}-mbr = ${libdir}/${BPN}/mbr.bin
+FILES_${PN}-chain = ${libdir}/${BPN}/chain.c32
+FILES_${PN}-isolinux = ${libdir}/${BPN}/isolinux.bin
+FILES_${PN}-pxelinux = ${libdir}/${BPN}/pxelinux.0
+FILES_${PN}-dev += ${datadir}/${BPN}/com32/lib*${SOLIBS}
${datadir}/${BPN}/com32/include ${datadir}/${BPN}/com32/com32.ld
+FILES_${PN}-staticdev += ${datadir}/${BPN}/com32/lib*.a
${libdir}/${BPN}/com32/lib*.a
+FILES_${PN}-misc = ${libdir}/${BPN}/* ${bindir}/*
BBCLASSEXTEND = native
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/10] foomatic-filters: fix CUPS directory config
- use CUPS_SERVERBIN to configure the CUPS directory
- the removed variables are not used anymore
Fix the following warning:
WARNING: QA Issue: foomatic-filters: Files/directories were installed but not
shipped
/usr/lib64
/usr/lib64/cups
/usr/lib64/cups/filter
/usr/lib64/cups/backend
/usr/lib64/cups/filter/foomatic-rip
/usr/lib64/cups/backend/beh
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
b/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
index bb01f71..c0290b1 100644
--- a/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
+++ b/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
@@ -10,7 +10,7 @@ format using a printer-specific, but spooler-independent PPD
file. \
DEPENDS += cups perl libxml2
-PR = r0
+PR = r1
LICENSE = GPLv2+
LIC_FILES_CHKSUM =
file://${WORKDIR}/foomatic-filters-${PV}/COPYING;md5=393a5ca445f6965873eca0259a17f833
@@ -26,10 +26,7 @@ EXTRA_OECONF += --disable-file-converter-check
--with-file-converter=texttops
do_configure_prepend() {
export PERL=${bindir}/env perl
-export LIB_CUPS=${exec_prefix}/lib/cups # /usr/lib NOT libdir
-export CUPS_BACKENDS=${exec_prefix}/lib/cups/backend # /usr/lib NOT libdir
-export CUPS_FILTERS=${exec_prefix}/lib/cups/filter# /usr/lib NOT libdir
-export CUPS_PPDS=${datadir}/cups/model
+export CUPS_SERVERBIN=${exec_prefix}/lib/cups # /usr/lib NOT libdir
}
do_install_append_linuxstdbase() {
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/10] taglib: use LIB_SUFFIX in order to determine the correct baselib
WARNING: QA Issue: taglib: Files/directories were installed but not shipped
/usr/lib
/usr/lib/libtag.so
/usr/lib/libtag.so.1.12.0
/usr/lib/libtag.so.1
/usr/lib/libtag_c.so.0.0.0
/usr/lib/libtag_c.so
/usr/lib/libtag_c.so.0
...
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-support/taglib/taglib_1.8.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/taglib/taglib_1.8.bb
b/meta/recipes-support/taglib/taglib_1.8.bb
index c713e43..76d2e51 100644
--- a/meta/recipes-support/taglib/taglib_1.8.bb
+++ b/meta/recipes-support/taglib/taglib_1.8.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM =
file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \
file://taglib/audioproperties.h;beginline=1;endline=24;md5=9df2c7399519b7310568a7c55042ecee
-PR = r0
+PR = r1
# http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz
SRC_URI = https://github.com/downloads/taglib/taglib/taglib-1.8.tar.gz \
@@ -21,6 +21,8 @@ inherit cmake pkgconfig binconfig
PACKAGES =+ ${PN}-c
FILES_${PN}-c = ${libdir}/libtag_c.so.*
+EXTRA_OECMAKE = -DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}
+
do_configure_prepend () {
rm -f ${S}/admin/ltmain.sh
rm -f ${S}/admin/libtool.m4.in
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/10] run-postinsts: use BPN instead of PN
Fix the following warning:
WARNING: QA Issue: lib32-run-postinsts: Files/directories were installed but
not shipped
/usr/share/lib32-run-postinsts
/usr/share/lib32-run-postinsts/run-postinsts.awk
[YOCTO #3438]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/dpkg/run-postinsts_1.0.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
index 7438a10..4c9b2fd 100644
--- a/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
+++ b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
@@ -1,6 +1,6 @@
DESCRIPTION = Run postinstall scripts on device using awk
SECTION = devel
-PR = r8
+PR = r9
LICENSE = MIT
LIC_FILES_CHKSUM =
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
@@ -24,6 +24,6 @@ do_install() {
install -d ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/run-postinsts ${D}${sysconfdir}/init.d/
- install -d ${D}${datadir}/${PN}/
- install -m 0644 ${WORKDIR}/run-postinsts.awk ${D}${datadir}/${PN}/
+ install -d ${D}${datadir}/${BPN}/
+ install -m 0644 ${WORKDIR}/run-postinsts.awk ${D}${datadir}/${BPN}/
}
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/10] consolekit: add arch independent unpackaged files
Fix the following warning:
WARNING: QA Issue: consolekit: Files/directories were installed but not shipped
/usr/lib
/usr/lib/ConsoleKit
/usr/lib/ConsoleKit/run-seat.d
/usr/lib/ConsoleKit/scripts
/usr/lib/ConsoleKit/run-session.d
/usr/lib/ConsoleKit/scripts/ck-system-restart
/usr/lib/ConsoleKit/scripts/ck-system-stop
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-support/consolekit/consolekit_0.4.5.bb | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb
b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
index 67899f6..e510c45 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = ConsoleKit is a framework for defining and
tracking users, login
HOMEPAGE=http://www.freedesktop.org/wiki/Software/ConsoleKit;
BUGTRACKER=https://bugs.freedesktop.org/buglist.cgi?query_format=specificproduct=ConsoleKit;
-PR = r9
+PR = r10
LICENSE = GPLv2+
LIC_FILES_CHKSUM = file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
@@ -29,7 +29,9 @@ EXTRA_OECONF = ${POLKITCONF}
--with-systemdsystemunitdir=${systemd_unitdir}/sys
${@base_contains('DISTRO_FEATURES', 'pam',
'--enable-pam-module --with-pam-module-dir=${base_libdir}/security',
'--disable-pam-module', d)} \
-FILES_${PN} += ${localstatedir}/log/ConsoleKit ${libdir}/ConsoleKit
${systemd_unitdir} ${base_libdir} ${datadir}/dbus-1 ${datadir}/PolicyKit
${datadir}/polkit*
+FILES_${PN} += ${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \
+${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \
+${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*
FILES_${PN}-dbg += ${base_libdir}/security/.debug
PACKAGES =+ pam-plugin-ck-connector
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/10] gcc: target: fix libiberty removal
- use ${libdir} instead of ${exec_prefix}/lib
Fix the following warning:
WARNING: QA Issue: gcc: Files/directories were installed but not shipped
/usr/lib64/libiberty.a
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc| 2 +-
meta/recipes-devtools/gcc/gcc-package-target.inc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index d4caf61..2dc81f0 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = r15
+PR = r16
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.7.1
diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc
b/meta/recipes-devtools/gcc/gcc-package-target.inc
index c39aaa8..95a92c1 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -115,8 +115,8 @@ do_install () {
rm -f *gcc-?.?*
# We use libiberty from binutils
- find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f
- find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f
+ find ${D}${libdir} -name libiberty.a | xargs rm -f
+ find ${D}${libdir} -name libiberty.h | xargs rm -f
# Not sure why we end up with these but we don't want them...
rm -f ${TARGET_PREFIX}${TARGET_PREFIX}*
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/10] blktool: fix SRC_URI typo
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-extended/blktool/blktool_4-6.1.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/blktool/blktool_4-6.1.bb
b/meta/recipes-extended/blktool/blktool_4-6.1.bb
index 94a7a10..8bd1bae 100644
--- a/meta/recipes-extended/blktool/blktool_4-6.1.bb
+++ b/meta/recipes-extended/blktool/blktool_4-6.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://blktool.c;beginline=7;endline=8;md5=a5e798ea98fd50972088968a15e5f373
DEPENDS = glib-2.0
-PR = r0
+PR = r1
SRC_URI = ${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz;name=tarball \
${DEBIAN_MIRROR}/main/b/blktool/blktool_4-6.1.diff.gz;apply=yes;name=patch
@@ -16,7 +16,7 @@ SRC_URI =
${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz;name=tarball \
SRC_URI[tarball.md5sum] = 62edc09c9908107e69391c87f4f3fd40
SRC_URI[tarball.sha256sum] =
b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
-RC_URI[patch.md5sum] = cf605a683d54d1fbcb35b940076ddb0c
+SRC_URI[patch.md5sum] = cf605a683d54d1fbcb35b940076ddb0c
SRC_URI[patch.sha256sum] =
d7923527e1a00984620ab307c9047a653d7ae2856cd20a82de8a33328f381ae3
S = ${WORKDIR}/${BPN}-4.orig
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pseudo: fix sqlite path and package missing files
- replace --enable-sqlite-static with --with-sqlite-static=.. in order
to pass ${baselib} to configure (/lib doesn't work for the multilib
lib32 build)
- use ${exec_prefix}/lib instead of ${libdir} because pseudo always
uses /usr/lib
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../pseudo/files/modify-static-sqlite-option.patch | 31 ++
meta/recipes-devtools/pseudo/pseudo.inc| 9 ---
meta/recipes-devtools/pseudo/pseudo_1.4.1.bb | 2 +-
meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +-
4 files changed, 38 insertions(+), 6 deletions(-)
create mode 100644
meta/recipes-devtools/pseudo/files/modify-static-sqlite-option.patch
diff --git
a/meta/recipes-devtools/pseudo/files/modify-static-sqlite-option.patch
b/meta/recipes-devtools/pseudo/files/modify-static-sqlite-option.patch
new file mode 100644
index 000..e34da73
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/files/modify-static-sqlite-option.patch
@@ -0,0 +1,31 @@
+Replace --enable-static-sqlite with --with-static-sqlite=... so that
+the user can pass the sqlite location
+
+Upstream-Status: Pending
+Signed-off-by: Constantin Musca constantinx.mu...@intel.com
+
+Index: pseudo-1.4.1/configure
+===
+--- pseudo-1.4.1.orig/configure
pseudo-1.4.1/configure
+@@ -36,7 +36,7 @@ usage()
+ echo 2[--libdir=...]
+ echo 2[--suffix=...]
+ echo 2[--with-sqlite=...]
+-echo 2[--enable-static-sqlite]
++echo 2[--with-static-sqlite=...]
+ echo 2[--with-rpath=...|--without-rpath]
+ echo 2[--cflags='']
+ echo 2[--bits=32|64]
+@@ -58,8 +58,9 @@ do
+ --libdir=*)
+ opt_libdir=${arg#--libdir=}
+ ;;
+---enable-static-sqlite)
+-sqlite_ldarg='$(SQLITE)/lib/libsqlite3.a'
++--with-static-sqlite=*)
++opt_static_sqlite=${arg#--with-static-sqlite=}
++sqlite_ldarg='$(SQLITE)'/${opt_static_sqlite}
+ use_maybe_rpath=false
+ ;;
+ --with-sqlite=*)
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc
b/meta/recipes-devtools/pseudo/pseudo.inc
index 98f706c..596f490 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -12,9 +12,10 @@ DEPENDS = sqlite3
SRC_URI_append_class-nativesdk = file://symver.patch
SRC_URI_append_class-native = file://symver.patch
+SRC_URI_append = file://modify-static-sqlite-option.patch
-FILES_${PN} = ${libdir}/pseudo/lib*/libpseudo.so ${bindir}/*
${localstatedir}/pseudo ${prefix}/var/pseudo
-FILES_${PN}-dbg += ${libdir}/pseudo/lib*/.debug
+FILES_${PN} = ${exec_prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/*
${localstatedir}/pseudo ${prefix}/var/pseudo
+FILES_${PN}-dbg += ${exec_prefix}/lib/pseudo/lib*/.debug
PROVIDES += virtual/fakeroot
MAKEOPTS =
@@ -30,9 +31,9 @@ NO32LIBS ??= 1
# Compile for the local machine arch...
do_compile () {
if [ ${SITEINFO_BITS} = 64 ]; then
- ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags=${CFLAGS}
--bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
+ ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags=${CFLAGS}
--bits=${SITEINFO_BITS} --with-static-sqlite=${baselib}/libsqlite3.a
--without-rpath
else
- ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags=${CFLAGS}
--bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
+ ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags=${CFLAGS}
--bits=${SITEINFO_BITS} --with-static-sqlite=${baselib}/libsqlite3.a
--without-rpath
fi
oe_runmake ${MAKEOPTS}
}
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.4.1.bb
b/meta/recipes-devtools/pseudo/pseudo_1.4.1.bb
index 70fe9c0..8367a34 100644
--- a/meta/recipes-devtools/pseudo/pseudo_1.4.1.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_1.4.1.bb
@@ -1,6 +1,6 @@
require pseudo.inc
-PR = r13
+PR = r14
SRC_URI = http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2;
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb
b/meta/recipes-devtools/pseudo/pseudo_git.bb
index e394ffb..c8ec5ad 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -2,7 +2,7 @@ require pseudo.inc
SRCREV = 398a264490713c912b4ce465251a8a82a7905f45
PV = 1.4.1+git${SRCPV}
-PR = r28
+PR = r29
DEFAULT_PREFERENCE = -1
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi
[OE-core] [PATCH v5] netbase: split up in netbase and init-ifupdown
- netbase should only include etc-rpc, etc-protocols, etc-services
and the hosts file
- the init script/configuration files should be in another package
(init-ifupdown)
[YOCTO #2486]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/conf/layer.conf | 1 +
.../init-ifupdown/init-ifupdown-1.0/copyright | 11 ++
.../init-ifupdown-1.0}/init| 0
.../init-ifupdown-1.0}/interfaces | 0
.../init-ifupdown-1.0}/nfsroot | 0
.../init-ifupdown-1.0}/qemuarm/interfaces | 0
.../init-ifupdown-1.0}/qemuarmv6/interfaces| 0
.../init-ifupdown-1.0}/qemuarmv7/interfaces| 0
.../init-ifupdown-1.0}/qemumips/interfaces | 0
.../init-ifupdown-1.0}/qemumips64/interfaces | 0
.../init-ifupdown-1.0}/qemuppc/interfaces | 0
.../init-ifupdown-1.0}/qemush4/interfaces | 0
.../init-ifupdown-1.0}/qemux86-64/interfaces | 0
.../init-ifupdown-1.0}/qemux86/interfaces | 0
.../init-ifupdown/init-ifupdown_1.0.bb | 42 ++
meta/recipes-core/netbase/netbase_5.0.bb | 32 +++--
.../packagegroups/packagegroup-core-boot.bb| 3 +-
17 files changed, 60 insertions(+), 29 deletions(-)
create mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/init (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/nfsroot (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemuarm/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemuarmv6/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemuarmv7/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemumips/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemumips64/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemuppc/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemush4/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemux86-64/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemux86/interfaces (100%)
create mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 3259e5c..6e5cd0c 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -22,6 +22,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += \
shadow-securetty \
opkg-config-base \
netbase \
+ init-ifupdown \
connman-conf \
formfactor \
xserver-xf86-config \
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
new file mode 100644
index 000..2a8e0d1
--- /dev/null
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
@@ -0,0 +1,11 @@
+This package was created by Peter Tobias tob...@et-inf.fho-emden.de on
+Wed, 24 Aug 1994 21:33:28 +0200 and maintained by Anthony Towns
+a...@debian.org until 2001.
+It is currently maintained by Marco d'Itri m...@linux.it.
+
+Copyright 1994-2010 Peter Tobias, Anthony Towns and Marco d'Itri
+
+The programs in this package are distributed under the terms of the GNU
+General Public License, version 2 as distributed by the Free Software
+Foundation. On Debian systems, a copy of this license may be found in
+/usr/share/common-licenses/GPL-2.
diff --git a/meta/recipes-core/netbase/netbase-5.0/init
b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init
similarity index 100%
rename from meta/recipes-core/netbase/netbase-5.0/init
rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init
diff --git a/meta/recipes-core/netbase/netbase-5.0/interfaces
b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
similarity index 100%
rename from meta/recipes-core/netbase/netbase-5.0/interfaces
rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
diff --git a/meta/recipes-core/netbase/netbase-5.0/nfsroot
b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot
similarity index 100%
rename from meta/recipes-core/netbase/netbase-5.0/nfsroot
rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot
diff --git a/meta/recipes-core/netbase/netbase-5.0/qemuarm/interfaces
b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces
similarity index 100%
rename from meta/recipes-core/netbase/netbase-5.0/qemuarm/interfaces
rename to meta/recipes-core/init-ifupdown
[OE-core] [PATCH v6] netbase: split up in netbase and init-ifupdown
- netbase should only include etc-rpc, etc-protocols, etc-services
and the hosts file
- the init script/configuration files should be in another package
(init-ifupdown)
[YOCTO #2486]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/conf/layer.conf | 1 +
.../init-ifupdown/init-ifupdown-1.0/copyright | 11 ++
.../init-ifupdown-1.0}/init| 0
.../init-ifupdown-1.0}/interfaces | 0
.../init-ifupdown-1.0}/nfsroot | 0
.../init-ifupdown-1.0}/qemuarm/interfaces | 0
.../init-ifupdown-1.0}/qemuarmv6/interfaces| 0
.../init-ifupdown-1.0}/qemuarmv7/interfaces| 0
.../init-ifupdown-1.0}/qemumips/interfaces | 0
.../init-ifupdown-1.0}/qemumips64/interfaces | 0
.../init-ifupdown-1.0}/qemuppc/interfaces | 0
.../init-ifupdown-1.0}/qemush4/interfaces | 0
.../init-ifupdown-1.0}/qemux86-64/interfaces | 0
.../init-ifupdown-1.0}/qemux86/interfaces | 0
.../init-ifupdown/init-ifupdown_1.0.bb | 39 ++
meta/recipes-core/netbase/netbase_5.0.bb | 32 +++---
.../packagegroups/packagegroup-core-boot.bb| 3 +-
17 files changed, 57 insertions(+), 29 deletions(-)
create mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/init (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/nfsroot (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemuarm/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemuarmv6/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemuarmv7/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemumips/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemumips64/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemuppc/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemush4/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemux86-64/interfaces (100%)
rename meta/recipes-core/{netbase/netbase-5.0 =
init-ifupdown/init-ifupdown-1.0}/qemux86/interfaces (100%)
create mode 100644 meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 3259e5c..6e5cd0c 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -22,6 +22,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += \
shadow-securetty \
opkg-config-base \
netbase \
+ init-ifupdown \
connman-conf \
formfactor \
xserver-xf86-config \
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
new file mode 100644
index 000..2a8e0d1
--- /dev/null
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
@@ -0,0 +1,11 @@
+This package was created by Peter Tobias tob...@et-inf.fho-emden.de on
+Wed, 24 Aug 1994 21:33:28 +0200 and maintained by Anthony Towns
+a...@debian.org until 2001.
+It is currently maintained by Marco d'Itri m...@linux.it.
+
+Copyright 1994-2010 Peter Tobias, Anthony Towns and Marco d'Itri
+
+The programs in this package are distributed under the terms of the GNU
+General Public License, version 2 as distributed by the Free Software
+Foundation. On Debian systems, a copy of this license may be found in
+/usr/share/common-licenses/GPL-2.
diff --git a/meta/recipes-core/netbase/netbase-5.0/init
b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init
similarity index 100%
rename from meta/recipes-core/netbase/netbase-5.0/init
rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init
diff --git a/meta/recipes-core/netbase/netbase-5.0/interfaces
b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
similarity index 100%
rename from meta/recipes-core/netbase/netbase-5.0/interfaces
rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
diff --git a/meta/recipes-core/netbase/netbase-5.0/nfsroot
b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot
similarity index 100%
rename from meta/recipes-core/netbase/netbase-5.0/nfsroot
rename to meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot
diff --git a/meta/recipes-core/netbase/netbase-5.0/qemuarm/interfaces
b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces
similarity index 100%
rename from meta/recipes-core/netbase/netbase-5.0/qemuarm/interfaces
rename to meta/recipes-core/init-ifupdown
Re: [OE-core] [PATCH] pseudo: fix sqlite path and package missing files
On 02/05/2013 01:50 AM, Peter Seebach wrote: On Mon, 4 Feb 2013 23:37:59 + Richard Purdie richard.pur...@linuxfoundation.org wrote: Agreed. Can someone send me a patch which makes it all work please? :) I probably can. I think the 1.4.3 patch I sent out recently (sgw was looking at it, but the binaries weren't up on the downloads server yet) probably covers most of it, but not the case where sqlite-libdir isn't lib, which is probably (??) a target-only case. Can someone show me a test case where it fails, so I can add that to my pile of pseudo test cases, and then stare at it for a while? -s Here's a test case: 1. local.conf: MACHINE = qemux86-64 require conf/multilib.conf MULTILIBS = multilib:lib32 DEFAULTTUNE_virtclass-multilib-lib32 = x86 2. build pseudo Cheers, Constantin ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 0/3] On-target gcc enhancement
This patchset enables the user to build gcc with configurable multilib options. The following changes since commit cfb082961a6c9ac3d65738031c4071210529cd07: bitbake: build.py: Dump out performance data of individual tasks (2013-01-28 14:49:05 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib cmuscax/gcc_enhan8 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/gcc_enhan8 Constantin Musca (3): autotools.bbclass: add EXTRACONFFUNCS variable multilib.conf: add TARGET_ARCH TARGET_SYS to MULTILIB_SAVE_VARNAME gcc: enable multilib for target gcc meta/classes/autotools.bbclass | 4 +- meta/conf/multilib.conf| 2 +- meta/recipes-devtools/gcc/gcc-4.7.inc | 3 +- .../gcc/gcc-4.7/use-ml-conf-files-from-B.patch | 87 ++ meta/recipes-devtools/gcc/gcc-common.inc | 24 +++ meta/recipes-devtools/gcc/gcc-configure-common.inc | 3 +- meta/recipes-devtools/gcc/gcc-configure-target.inc | 1 + meta/recipes-devtools/gcc/gcc-multilib-config.inc | 190 + meta/recipes-devtools/gcc/libgcc_4.7.bb| 73 9 files changed, 383 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-4.7/use-ml-conf-files-from-B.patch create mode 100644 meta/recipes-devtools/gcc/gcc-multilib-config.inc -- 1.7.11.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 2/3] multilib.conf: add TARGET_ARCH TARGET_SYS to MULTILIB_SAVE_VARNAME
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/conf/multilib.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 97b53ec..8f03661 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -2,7 +2,7 @@
baselib = ${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or
'INVALID'), True) or 'lib'}
MULTILIB_VARIANTS = ${@extend_variants(d,'MULTILIBS','multilib')}
-MULTILIB_SAVE_VARNAME = DEFAULTTUNE
+MULTILIB_SAVE_VARNAME = DEFAULTTUNE TARGET_ARCH TARGET_SYS
MULTILIBS ??= multilib:lib32
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] migrate_localcount.bbclass: use PRAUTOINX instead of PN PV
- we need to use PRAUTOINX (it covers all cases)
- it addresses bumped PE issues
[YOCTO #3071]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/classes/migrate_localcount.bbclass | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/meta/classes/migrate_localcount.bbclass
b/meta/classes/migrate_localcount.bbclass
index 59f14e8..3916ad4 100644
--- a/meta/classes/migrate_localcount.bbclass
+++ b/meta/classes/migrate_localcount.bbclass
@@ -18,14 +18,13 @@ python migrate_localcount_handler () {
if not revs or not counts:
return
-srcrev = bb.fetch2.get_srcrev(e.data)
-bpv = pv[:pv.find(srcrev)]
-
if len(revs) != len(counts):
bb.warn(The number of revs and localcounts don't match in %s %
pn)
return
-version = 'AUTOINC-%s-%s' % (pn, bpv)
+version = e.data.getVar('PRAUTOINX', True)
+srcrev = bb.fetch2.get_srcrev(e.data)
+base_ver = 'AUTOINC-%s' % version[:version.find(srcrev)]
pkgarch = e.data.getVar('PACKAGE_ARCH', True)
value = max(int(count) for count in counts)
@@ -40,7 +39,7 @@ python migrate_localcount_handler () {
flock = bb.utils.lockfile(%s.lock % df)
with open(df, 'a') as fd:
fd.write('PRAUTO$%s$%s$%s = %s\n' %
-(version, pkgarch, srcrev, str(value)))
+(base_ver, pkgarch, srcrev, str(value)))
bb.utils.unlockfile(flock)
}
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] puzzles: upgrade to r9751
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-sato/puzzles/{puzzles_r9733.bb = puzzles_r9751.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-sato/puzzles/{puzzles_r9733.bb = puzzles_r9751.bb} (100%)
diff --git a/meta/recipes-sato/puzzles/puzzles_r9733.bb
b/meta/recipes-sato/puzzles/puzzles_r9751.bb
similarity index 100%
rename from meta/recipes-sato/puzzles/puzzles_r9733.bb
rename to meta/recipes-sato/puzzles/puzzles_r9751.bb
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cairo: upgrade to 1.12.10
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-graphics/cairo/{cairo_1.12.8.bb = cairo_1.12.10.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/cairo/{cairo_1.12.8.bb = cairo_1.12.10.bb} (92%)
diff --git a/meta/recipes-graphics/cairo/cairo_1.12.8.bb
b/meta/recipes-graphics/cairo/cairo_1.12.10.bb
similarity index 92%
rename from meta/recipes-graphics/cairo/cairo_1.12.8.bb
rename to meta/recipes-graphics/cairo/cairo_1.12.10.bb
index 567a17f..00c0377 100644
--- a/meta/recipes-graphics/cairo/cairo_1.12.8.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.12.10.bb
@@ -2,12 +2,12 @@ require cairo.inc
LIC_FILES_CHKSUM = file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77
-PR = r1
+PR = r0
SRC_URI = http://cairographics.org/releases/cairo-${PV}.tar.xz;
-SRC_URI[md5sum] = 8b3dcade859c44fb7e56fc68edfe9a45
-SRC_URI[sha256sum] =
8fbb6fc66117ab4100bad830cb4479497e53c6f3facb98bf05c8d298554ebdd9
+SRC_URI[md5sum] = bddd5c5b734ab4b9683eb0ba363070d4
+SRC_URI[sha256sum] =
f1581aef210f6caa9cf42875fb66ab3b47a32db9436bdfa9913b9bbd5034b03b
PACKAGES =+ cairo-gobject cairo-script-interpreter cairo-perf-utils
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] prs: change PRSERV_HOST semantics
- remove PRSERV_PORT variable
- use 'hostname:port' as PRSERV_HOST format
- remove USE_PR_SERV variable
- one can activate PRS by setting PRSERV_HOST
[YOCTO #3744]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/classes/package.bbclass | 8 +++-
meta/classes/prserv.bbclass | 2 +-
meta/conf/bitbake.conf | 7 +--
meta/lib/oe/prservice.py | 18 --
4 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 8e07168..60d3df7 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -396,15 +396,13 @@ def runtime_mapping_rename (varname, d):
#
python package_get_auto_pr() {
-# per recipe PRSERV_HOST PRSERV_PORT
+# per recipe PRSERV_HOST
pn = d.getVar('PN', True)
host = d.getVar(PRSERV_HOST_ + pn, True)
-port = d.getVar(PRSERV_PORT_ + pn, True)
if not (host is None):
d.setVar(PRSERV_HOST, host)
-if not (port is None):
-d.setVar(PRSERV_PORT, port)
-if d.getVar('USE_PR_SERV', True) != 0:
+
+if d.getVar('PRSERV_HOST', True):
try:
auto_pr=prserv_get_pr_auto(d)
except Exception as e:
diff --git a/meta/classes/prserv.bbclass b/meta/classes/prserv.bbclass
index 33547f9..b440d86 100644
--- a/meta/classes/prserv.bbclass
+++ b/meta/classes/prserv.bbclass
@@ -3,7 +3,7 @@ def prserv_get_pr_auto(d):
import re
pv = d.getVar(PV, True)
-if d.getVar('USE_PR_SERV', True) != 1:
+if not d.getVar('PRSERV_HOST', True):
if 'AUTOINC' in pv:
d.setVar(PKGV, pv.replace(AUTOINC, 0))
bb.warn(Not using network based PR service)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 2dc50ca..aa12753 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -207,11 +207,6 @@ SPECIAL_PKGSUFFIX = -native -cross -initial -intermediate
-crosssdk -cross-cana
BPN = ${@base_prune_suffix(d.getVar('PN', True),
d.getVar('SPECIAL_PKGSUFFIX', True).split(), d)}
BP = ${BPN}-${PV}
-#
-# network based PR service
-#
-USE_PR_SERV = ${@[1,0][((not d.getVar('PRSERV_HOST', True)) or (not
d.getVar('PRSERV_PORT', True))) and (not d.getVar('PRSERV_LOCKDOWN', True))]}
-
# Package info.
SECTION = base
@@ -781,7 +776,7 @@ BB_SIGNATURE_HANDLER ?= OEBasicHash
BB_HASHBASE_WHITELIST ?= TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR \
SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \
USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \
-PRSERV_PORT PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \
+PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \
CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_DISABLE
BB_HASHCONFIG_WHITELIST ?= ${BB_HASHBASE_WHITELIST} DATE TIME SESSION_MANAGER
\
DBUS_SESSION_BUS_ADDRESS SSH_AGENT_PID XDG_SESSION_COOKIE SSH_AUTH_SOCK \
diff --git a/meta/lib/oe/prservice.py b/meta/lib/oe/prservice.py
index c3fb76a..57fb39a 100644
--- a/meta/lib/oe/prservice.py
+++ b/meta/lib/oe/prservice.py
@@ -1,11 +1,10 @@
def prserv_make_conn(d, check = False):
import prserv.serv
-host = d.getVar(PRSERV_HOST,True)
-port = d.getVar(PRSERV_PORT,True)
+host_params = filter(None, (d.getVar(PRSERV_HOST, True) or
'').split(':'))
try:
conn = None
-conn = prserv.serv.PRServerConnection(host,int(port))
+conn = prserv.serv.PRServerConnection(host_params[0],
int(host_params[1]))
if check:
if not conn.ping():
raise Exception('service not available')
@@ -16,7 +15,7 @@ def prserv_make_conn(d, check = False):
return conn
def prserv_dump_db(d):
-if d.getVar('USE_PR_SERV', True) != 1:
+if not d.getVar('PRSERV_HOST', True):
bb.error(Not using network based PR service)
return None
@@ -35,7 +34,7 @@ def prserv_dump_db(d):
return conn.export(opt_version, opt_pkgarch, opt_checksum, opt_col)
def prserv_import_db(d, filter_version=None, filter_pkgarch=None,
filter_checksum=None):
-if d.getVar('USE_PR_SERV', True) != 1:
+if not d.getVar('PRSERV_HOST', True):
bb.error(Not using network based PR service)
return None
@@ -115,14 +114,13 @@ def prserv_export_tofile(d, metainfo, datainfo, lockdown,
nomax=False):
bb.utils.unlockfile(lf)
def prserv_check_avail(d):
-host = d.getVar(PRSERV_HOST,True)
-port = d.getVar(PRSERV_PORT,True)
+host_params = filter(None, (d.getVar(PRSERV_HOST, True) or
'').split(':'))
try:
-if not host:
+if len(host_params) != 2:
raise TypeError
else:
-port = int(port)
+int(host_params[1])
except TypeError:
-bb.fatal(Undefined or incorrect values of PRSERV_HOST or PRSERV_PORT)
+bb.fatal('Undefined/incorrect PRSERV_HOST value. Format: host:port')
else:
prserv_make_conn(d, True
[OE-core] [PATCH 3/3] prs: add LOCALCOUNT to AUTOINCs migration feature
- use migrate_localcount.bbclass to generate AUTOINC entries
which are exported to LOCALCOUNT_DUMPFILE
- import the generated AUTOINC entries
- one can migrate LOCALCOUNT to AUTOINC by executing:
bitbake-prserv-tool migrate_localcount
[YOCTO #3071]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/classes/migrate_localcount.bbclass | 47 +
meta/conf/migrate_localcount.conf | 1 +
scripts/bitbake-prserv-tool | 32 ++
3 files changed, 80 insertions(+)
create mode 100644 meta/classes/migrate_localcount.bbclass
create mode 100644 meta/conf/migrate_localcount.conf
diff --git a/meta/classes/migrate_localcount.bbclass
b/meta/classes/migrate_localcount.bbclass
new file mode 100644
index 000..59f14e8
--- /dev/null
+++ b/meta/classes/migrate_localcount.bbclass
@@ -0,0 +1,47 @@
+PRSERV_DUMPDIR ??= ${LOG_DIR}/db
+LOCALCOUNT_DUMPFILE ??= ${PRSERV_DUMPDIR}/prserv-localcount-exports.inc
+
+python migrate_localcount_handler () {
+import bb.event
+if not e.data:
+return
+
+if isinstance(e, bb.event.RecipeParsed):
+pv = e.data.getVar('PV', True)
+if not 'AUTOINC' in pv:
+return
+
+localcounts = bb.persist_data.persist('BB_URI_LOCALCOUNT', e.data)
+pn = e.data.getVar('PN', True)
+revs = localcounts.get_by_pattern('%%-%s_rev' % pn)
+counts = localcounts.get_by_pattern('%%-%s_count' % pn)
+if not revs or not counts:
+return
+
+srcrev = bb.fetch2.get_srcrev(e.data)
+bpv = pv[:pv.find(srcrev)]
+
+if len(revs) != len(counts):
+bb.warn(The number of revs and localcounts don't match in %s %
pn)
+return
+
+version = 'AUTOINC-%s-%s' % (pn, bpv)
+pkgarch = e.data.getVar('PACKAGE_ARCH', True)
+value = max(int(count) for count in counts)
+
+if len(revs) == 1:
+if srcrev != ('AUTOINC+%s' % revs[0]):
+value += 1
+else:
+value += 1
+
+bb.utils.mkdirhier(e.data.getVar('PRSERV_DUMPDIR', True))
+df = e.data.getVar('LOCALCOUNT_DUMPFILE', True)
+flock = bb.utils.lockfile(%s.lock % df)
+with open(df, 'a') as fd:
+fd.write('PRAUTO$%s$%s$%s = %s\n' %
+(version, pkgarch, srcrev, str(value)))
+bb.utils.unlockfile(flock)
+}
+
+addhandler migrate_localcount_handler
diff --git a/meta/conf/migrate_localcount.conf
b/meta/conf/migrate_localcount.conf
new file mode 100644
index 000..e486e03
--- /dev/null
+++ b/meta/conf/migrate_localcount.conf
@@ -0,0 +1 @@
+INHERIT += migrate_localcount
diff --git a/scripts/bitbake-prserv-tool b/scripts/bitbake-prserv-tool
index f3855df..4654e6d 100755
--- a/scripts/bitbake-prserv-tool
+++ b/scripts/bitbake-prserv-tool
@@ -47,6 +47,35 @@ do_import ()
return $ret
}
+do_migrate_localcount ()
+{
+df=`bitbake -R conf/migrate_localcount.conf -e | \
+grep ^LOCALCOUNT_DUMPFILE= | cut -f2 -d\`
+if [ x${df} == x ];
+then
+echo LOCALCOUNT_DUMPFILE is not defined!
+return 1
+fi
+
+rm -rf $df
+clean_cache
+echo Exporting LOCALCOUNT to AUTOINCs...
+bitbake -R conf/migrate_localcount.conf -p
+[ ! $? -eq 0 ] echo Exporting failed! exit 1
+
+echo Importing generated AUTOINC entries...
+[ -e $df ] do_import $df
+
+if [ ! $? -eq 0 ]
+then
+echo Migration from LOCALCOUNT to AUTOINCs failed!
+return 1
+fi
+
+echo Migration from LOCALCOUNT to AUTOINCs succeeded!
+return 0
+}
+
[ $# -eq 0 ] help exit 1
case $1 in
@@ -56,6 +85,9 @@ export)
import)
do_import $2
;;
+migrate_localcount)
+do_migrate_localcount
+;;
*)
help
exit 1
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] prs: add LOCALCOUNT to AUTOINCs migration feature
On 01/22/2013 04:15 PM, Martin Jansa wrote:
On Tue, Jan 22, 2013 at 11:39:30AM +0200, Constantin Musca wrote:
- use migrate_localcount.bbclass to generate AUTOINC entries
which are exported to LOCALCOUNT_DUMPFILE
- import the generated AUTOINC entries
- one can migrate LOCALCOUNT to AUTOINC by executing:
bitbake-prserv-tool migrate_localcount
Those 2 bitbake patches are probably against poky not bitbake, had to
apply them manually.
[YOCTO #3071]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/classes/migrate_localcount.bbclass | 47 +
meta/conf/migrate_localcount.conf | 1 +
scripts/bitbake-prserv-tool | 32 ++
3 files changed, 80 insertions(+)
create mode 100644 meta/classes/migrate_localcount.bbclass
create mode 100644 meta/conf/migrate_localcount.conf
diff --git a/meta/classes/migrate_localcount.bbclass
b/meta/classes/migrate_localcount.bbclass
new file mode 100644
index 000..59f14e8
--- /dev/null
+++ b/meta/classes/migrate_localcount.bbclass
@@ -0,0 +1,47 @@
+PRSERV_DUMPDIR ??= ${LOG_DIR}/db
+LOCALCOUNT_DUMPFILE ??= ${PRSERV_DUMPDIR}/prserv-localcount-exports.inc
+
+python migrate_localcount_handler () {
+import bb.event
+if not e.data:
+return
+
+if isinstance(e, bb.event.RecipeParsed):
+pv = e.data.getVar('PV', True)
+if not 'AUTOINC' in pv:
+return
+
+localcounts = bb.persist_data.persist('BB_URI_LOCALCOUNT', e.data)
+pn = e.data.getVar('PN', True)
+revs = localcounts.get_by_pattern('%%-%s_rev' % pn)
+counts = localcounts.get_by_pattern('%%-%s_count' % pn)
why not query for right key directly?
BB_URI_LOCALCOUNT key appends branch since
http://git.openembedded.org/bitbake/commit/lib/bb/fetch?id=8c0afc13ad5eefea62b0b136f5b66792ba4e44cb
and you can probably create key from SRC_URI like git fetcher does.
Then you can show error when more then 1 entry matches instead of
counting max(LOCALCOUNT) from multiple entries.
Because AUTOINCs don't include branch information. I have considered the
approach you proposed but I think this method
is a straightforward solution.
Also this 'bitbake-prserv-tool migrate_localcount' needs to be executed
for all supported MACHINEs right? To fill prs db with all possible
PACKAGE_ARCH values.
That's right.
Cheers,
+if not revs or not counts:
+return
+
+srcrev = bb.fetch2.get_srcrev(e.data)
+bpv = pv[:pv.find(srcrev)]
+
+if len(revs) != len(counts):
+bb.warn(The number of revs and localcounts don't match in %s %
pn)
+return
+
+version = 'AUTOINC-%s-%s' % (pn, bpv)
+pkgarch = e.data.getVar('PACKAGE_ARCH', True)
+value = max(int(count) for count in counts)
+
+if len(revs) == 1:
+if srcrev != ('AUTOINC+%s' % revs[0]):
+value += 1
+else:
+value += 1
+
+bb.utils.mkdirhier(e.data.getVar('PRSERV_DUMPDIR', True))
+df = e.data.getVar('LOCALCOUNT_DUMPFILE', True)
+flock = bb.utils.lockfile(%s.lock % df)
+with open(df, 'a') as fd:
+fd.write('PRAUTO$%s$%s$%s = %s\n' %
+(version, pkgarch, srcrev, str(value)))
+bb.utils.unlockfile(flock)
+}
+
+addhandler migrate_localcount_handler
diff --git a/meta/conf/migrate_localcount.conf
b/meta/conf/migrate_localcount.conf
new file mode 100644
index 000..e486e03
--- /dev/null
+++ b/meta/conf/migrate_localcount.conf
@@ -0,0 +1 @@
+INHERIT += migrate_localcount
diff --git a/scripts/bitbake-prserv-tool b/scripts/bitbake-prserv-tool
index f3855df..4654e6d 100755
--- a/scripts/bitbake-prserv-tool
+++ b/scripts/bitbake-prserv-tool
@@ -47,6 +47,35 @@ do_import ()
return $ret
}
+do_migrate_localcount ()
+{
+df=`bitbake -R conf/migrate_localcount.conf -e | \
+grep ^LOCALCOUNT_DUMPFILE= | cut -f2 -d\`
+if [ x${df} == x ];
+then
+echo LOCALCOUNT_DUMPFILE is not defined!
+return 1
+fi
+
+rm -rf $df
+clean_cache
+echo Exporting LOCALCOUNT to AUTOINCs...
+bitbake -R conf/migrate_localcount.conf -p
+[ ! $? -eq 0 ] echo Exporting failed! exit 1
+
+echo Importing generated AUTOINC entries...
+[ -e $df ] do_import $df
+
+if [ ! $? -eq 0 ]
+then
+echo Migration from LOCALCOUNT to AUTOINCs failed!
+return 1
+fi
+
+echo Migration from LOCALCOUNT to AUTOINCs succeeded!
+return 0
+}
+
[ $# -eq 0 ] help exit 1
case $1 in
@@ -56,6 +85,9 @@ export)
import)
do_import $2
;;
+migrate_localcount)
+do_migrate_localcount
+;;
*)
help
exit 1
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Cheers,
Constantin
[OE-core] [PATCH 2/4] core-image-gtk-directfb: rename to core-image-directfb
- DirectFB is not supported by gtk versions = 2.18
- use packagegroup-core-directfb instead of packagegroup-core-gtk-directfb
[YOCTO #3642]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../images/{core-image-gtk-directfb.bb = core-image-directfb.bb} | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
rename meta/recipes-graphics/images/{core-image-gtk-directfb.bb =
core-image-directfb.bb} (78%)
diff --git a/meta/recipes-graphics/images/core-image-gtk-directfb.bb
b/meta/recipes-graphics/images/core-image-directfb.bb
similarity index 78%
rename from meta/recipes-graphics/images/core-image-gtk-directfb.bb
rename to meta/recipes-graphics/images/core-image-directfb.bb
index 05f03cd..4f47185 100644
--- a/meta/recipes-graphics/images/core-image-gtk-directfb.bb
+++ b/meta/recipes-graphics/images/core-image-directfb.bb
@@ -1,21 +1,20 @@
LICENSE = MIT
-PR=r1
+PR=r0
LIC_FILES_CHKSUM =
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
-
inherit core-image
IMAGE_INSTALL += \
${CORE_IMAGE_BASE_INSTALL} \
packagegroup-core-basic \
- packagegroup-core-gtk-directfb \
+ packagegroup-core-directfb \
python __anonymous () {
packages = d.getVar('DISTRO_FEATURES', True).split()
if x11 in packages:
- raise bb.parse.SkipPackage(FEATURE \x11\ is in
DISTRO_FEATURES, Please remove \x11\ from DISTRO_FEATURES, use
\gtk-directfb\ instead of it\n)
+ raise bb.parse.SkipPackage(FEATURE \x11\ is in
DISTRO_FEATURES, Please remove \x11\ from DISTRO_FEATURES, use \directfb\
instead of it\n)
}
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] packagegroup-core-gtk-directfb: rename to packagegroup-core-directfb
- DirectFB is not supported by gtk versions = 2.18
- remove the backwards compatibility statements (packagegroup-core-directfb
is an independent packagegroup)
- remove all gtk dependencies
[YOCTO #3642]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
...oup-core-gtk-directfb.bb = packagegroup-core-directfb.bb} | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
rename meta/recipes-graphics/packagegroups/{packagegroup-core-gtk-directfb.bb
= packagegroup-core-directfb.bb} (49%)
diff --git
a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
similarity index 49%
rename from
meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
rename to meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
index 55b0b9d..aca3a67 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
@@ -1,14 +1,9 @@
-SUMMARY = GTK+ over DirectFB without X11
-PR = r1
+SUMMARY = DirectFB without X11
+PR = r0
LICENSE = MIT
inherit packagegroup
-# For backwards compatibility after rename
-RPROVIDES_${PN} = task-core-gtk-directfb-base
-RREPLACES_${PN} = task-core-gtk-directfb-base
-RCONFLICTS_${PN} = task-core-gtk-directfb-base
-
TOUCH = ' ${@base_contains(MACHINE_FEATURES, touchscreen, tslib
tslib-calibrate tslib-tests, ,d)}'
RDEPENDS_${PN} = \
@@ -17,7 +12,5 @@ RDEPENDS_${PN} = \
pango \
pango-modules \
fontconfig \
- gtk+ \
- gtk-demo \
${TOUCH} \
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] Remove gtk-directfb
DirectFB is no longer supported by GTK 3 and even in 2 the backend hasn't
worked since 2.18.
This patchset removes gtk-directfb and it creates a simple directfb
packagegroup/image.
The following changes since commit 3db277b18b8923daca545aa53bcfbbe9d43d3baa:
update-rc.d: fix failure on target (2013-01-17 20:16:46 +)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib cmuscax/gtk-directfb
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/gtk-directfb
Constantin Musca (4):
packagegroup-core-gtk-directfb: rename to packagegroup-core-directfb
core-image-gtk-directfb: rename to core-image-directfb
gtk+: remove directfb support
cairo: use directfb instead of gtk-directfb
meta/recipes-gnome/gtk+/gtk+.inc | 7 +--
meta/recipes-gnome/gtk+/gtk+_2.24.14.bb | 2 +-
meta/recipes-graphics/cairo/cairo.inc | 4 ++--
meta/recipes-graphics/cairo/cairo_1.12.8.bb | 2 +-
.../{core-image-gtk-directfb.bb = core-image-directfb.bb}| 7 +++
...oup-core-gtk-directfb.bb = packagegroup-core-directfb.bb} | 11 ++-
6 files changed, 10 insertions(+), 23 deletions(-)
rename meta/recipes-graphics/images/{core-image-gtk-directfb.bb =
core-image-directfb.bb} (78%)
rename meta/recipes-graphics/packagegroups/{packagegroup-core-gtk-directfb.bb
= packagegroup-core-directfb.bb} (49%)
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] gtk+: remove directfb support
- DirectFB is not supported by gtk versions = 2.18
[YOCTO #3642]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-gnome/gtk+/gtk+.inc| 7 +--
meta/recipes-gnome/gtk+/gtk+_2.24.14.bb | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index 97d3650..3a40409 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -14,14 +14,9 @@ X11DEPENDS = virtual/libx11 libxext libxcursor libxrandr
libxdamage libxrender
DEPENDS = glib-2.0 pango atk jpeg libpng gdk-pixbuf-native
docbook-utils-native \
libgcrypt cairo gdk-pixbuf
-PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}
+PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}
-# for gtk+ 2.x, have to pick either x11 or directfb not both
-# for gtk+ 3.x, PACKAGECONFIG[gtk-directfb] should be removed because directfb
will not be support as
-# a backend.
PACKAGECONFIG[x11] = --with-x=yes
--with-gdktarget=x11,--with-x=no,${X11DEPENDS}
-PACKAGECONFIG[gtk-directfb] = --with-gdktarget=directfb,,directfb
inherit autotools gtk-doc pkgconfig update-alternatives
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb
b/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb
index d794840..fab360d 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb
@@ -29,7 +29,7 @@ SRC_URI =
http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
#file://combo-arrow-size.patch;striplevel=0
#file://configurefix.patch
-PR = r0
+PR = r1
SRC_URI[md5sum] = e2c16f119ed624893ecfc3775930ae4c
SRC_URI[sha256sum] =
8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] cairo: use directfb instead of gtk-directfb
- we now have directfb as DISTRO_FEATURE
- DirectFB is not supported by gtk versions = 2.18
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-graphics/cairo/cairo.inc | 4 ++--
meta/recipes-graphics/cairo/cairo_1.12.8.bb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/cairo/cairo.inc
b/meta/recipes-graphics/cairo/cairo.inc
index 217e297..9bec6c2 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -13,9 +13,9 @@ LICENSE = MPL-1 LGPLv2.1
X11DEPENDS = virtual/libx11 libsm libxrender libxext
DEPENDS = libpng fontconfig pixman glib-2.0
PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb',
'', d)}
+ ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}
PACKAGECONFIG[x11] = --with-x=yes,--without-x,${X11DEPENDS}
-PACKAGECONFIG[gtk-directfb] = --enable-directfb=yes,,directfb
+PACKAGECONFIG[directfb] = --enable-directfb=yes,,directfb
BBCLASSEXTEND = native
#check for TARGET_FPU=soft and inform configure of the result so it can
disable some floating points
diff --git a/meta/recipes-graphics/cairo/cairo_1.12.8.bb
b/meta/recipes-graphics/cairo/cairo_1.12.8.bb
index 567a17f..49b1786 100644
--- a/meta/recipes-graphics/cairo/cairo_1.12.8.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.12.8.bb
@@ -2,7 +2,7 @@ require cairo.inc
LIC_FILES_CHKSUM = file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77
-PR = r1
+PR = r2
SRC_URI = http://cairographics.org/releases/cairo-${PV}.tar.xz;
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] packagegroup-core-gtk-directfb: rename to packagegroup-core-directfb
On 01/18/2013 02:23 PM, Martin Jansa wrote:
On Fri, Jan 18, 2013 at 01:48:29PM +0200, Constantin Musca wrote:
- DirectFB is not supported by gtk versions = 2.18
- remove the backwards compatibility statements (packagegroup-core-directfb
is an independent packagegroup)
And what will happen with task-core-gtk-directfb-base/
packagegroup-core-gtk-directfb packages already installed on targets?
It's also possible that someone still with task-core-gtk-directfb-base
will decide that now it's right time to do upgrade..
Cheers,
We decided to remove the backwards compatibility statements because the
patch adds basically a new
packagegroup (different from
task-core-gtk-directfb-base/packagegroup-core-gtk-directfb).
Cheers,
Constantin
- remove all gtk dependencies
[YOCTO #3642]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
...oup-core-gtk-directfb.bb = packagegroup-core-directfb.bb} | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
rename meta/recipes-graphics/packagegroups/{packagegroup-core-gtk-directfb.bb
= packagegroup-core-directfb.bb} (49%)
diff --git
a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
similarity index 49%
rename from
meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
rename to meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
index 55b0b9d..aca3a67 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
@@ -1,14 +1,9 @@
-SUMMARY = GTK+ over DirectFB without X11
-PR = r1
+SUMMARY = DirectFB without X11
+PR = r0
LICENSE = MIT
inherit packagegroup
-# For backwards compatibility after rename
-RPROVIDES_${PN} = task-core-gtk-directfb-base
-RREPLACES_${PN} = task-core-gtk-directfb-base
-RCONFLICTS_${PN} = task-core-gtk-directfb-base
-
TOUCH = ' ${@base_contains(MACHINE_FEATURES, touchscreen, tslib tslib-calibrate
tslib-tests, ,d)}'
RDEPENDS_${PN} = \
@@ -17,7 +12,5 @@ RDEPENDS_${PN} = \
pango \
pango-modules \
fontconfig \
- gtk+ \
- gtk-demo \
${TOUCH} \
--
1.7.11.7
___
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
[OE-core] [PATCH] pango: use qemu_run_binary instead of pango-native
- use qemu_run_binary from qemu.bbclass to run pango-querymodules
- remove pango-native from DEPENDS in order to do not create
unbuildable dependency chains (e.g. ['gtk+', 'pango', 'pango-native',
'cairo-native', 'directfb-native'])
[YOCTO #3642]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-graphics/pango/pango.inc | 26 --
meta/recipes-graphics/pango/pango_1.32.5.bb | 2 +-
2 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-graphics/pango/pango.inc
b/meta/recipes-graphics/pango/pango.inc
index ce5caf6..f622903 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -10,7 +10,7 @@ SECTION = libs
LICENSE = LGPLv2.0+
X11DEPENDS = virtual/libx11 libxft
-DEPENDS = glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils
pango-native harfbuzz
+DEPENDS = glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils
harfbuzz
PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}
PACKAGECONFIG[x11] = --with-x,--without-x,${X11DEPENDS}
@@ -22,7 +22,7 @@ PACKAGES_DYNAMIC += ^pango-module-.*
RRECOMMENDS_${PN} = ${@base_contains('DISTRO_FEATURES', 'x11',
'pango-module-basic-x', '', d)} pango-module-basic-fc
-inherit gnomebase gtk-doc
+inherit gnomebase gtk-doc qemu
# Create a pango-modules package
ALLOW_EMPTY_${BPN}-modules = 1
PACKAGES += ${BPN}-modules
@@ -49,26 +49,16 @@ if ! [ -e $D${sysconfdir}/pango ] ; then
fi
if [ x$D != x ]; then
-pango-querymodules $(ls -d -1 $D${libdir}/pango/${LIBV}/modules/*.so|\
-sed -e s:$D:$NATIVE_ROOT:g) \
-$D${sysconfdir}/pango/${MLPREFIX}pango.modules \
-2$D${sysconfdir}/pango/${MLPREFIX}pango.err
-
-# pango-querymodules always returns 0, so we need to check if pango.err has
-# anything in it
-if [ -s $D${sysconfdir}/pango/${MLPREFIX}pango.err ]; then
-rm $D${sysconfdir}/pango/${MLPREFIX}pango.err
-exit 1
-fi
+ ${@qemu_run_binary(d, '$D','/usr/bin/pango-querymodules')} \
+ $D${libdir}/pango/${LIBV}/modules/*.so \
+$D${sysconfdir}/pango/${MLPREFIX}pango.modules 2/dev/null
-sed -i -e s:$NATIVE_ROOT::g $D${sysconfdir}/pango/${MLPREFIX}pango.modules
+ [ $? -ne 0 ] exit 1
-# remove the empty pango.err
-rm $D${sysconfdir}/pango/${MLPREFIX}pango.err
+ sed -i -e s:$D:: $D${sysconfdir}/pango/${MLPREFIX}pango.modules
-exit 0
+ exit 0
fi
-
}
do_install_append () {
diff --git a/meta/recipes-graphics/pango/pango_1.32.5.bb
b/meta/recipes-graphics/pango/pango_1.32.5.bb
index fe93b52..6219940 100644
--- a/meta/recipes-graphics/pango/pango_1.32.5.bb
+++ b/meta/recipes-graphics/pango/pango_1.32.5.bb
@@ -2,7 +2,7 @@ require pango.inc
LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7
-PR = r1
+PR = r2
GNOME_COMPRESS_TYPE=xz
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 0/6] On-target multilib gcc enhacement
On 01/15/2013 09:40 AM, Saul Wold wrote: On 01/14/2013 07:16 AM, Constantin Musca wrote: This patchset enables the user to build gcc with configurable multilib options. The following changes since commit 53cc748b93e8af584557d6db5309c3e955182c5c: linux-libc-headers: fix headers install in long path name environments (2013-01-10 23:53:51 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib cmuscax/gcc_enhan3 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/gcc_enhan3 Constantin Musca (6): gcc: add missing dependency (zlib) gcc: remove the 64bithack patch multilib.conf: add TARGET_ARCH to MULTILIB_SAVE_VARNAME gcc: enable multilib for target gcc tune-mips32: add BASE_LIB to mips32 tunes tune-ppc603e: add BASE_LIB This patch set caused a number of failures on the Autobuilder today. please check the AB results. Thanks Sau! The re.sub flags argument doesn't exist in python 2.6 or in a lower version. Should I adapt my patch for 2.6 or do we need to update python on the AB systems ? Cheers, Constantin meta/conf/machine/include/tune-mips32.inc | 4 + meta/conf/machine/include/tune-ppc603e.inc | 1 + meta/conf/multilib.conf| 2 +- meta/recipes-devtools/gcc/gcc-4.7.inc | 5 +- meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch | 63 --- meta/recipes-devtools/gcc/gcc-common.inc | 25 +++ meta/recipes-devtools/gcc/gcc-configure-common.inc | 3 +- meta/recipes-devtools/gcc/gcc-configure-target.inc | 1 + meta/recipes-devtools/gcc/gcc-multilib-config.inc | 200 + meta/recipes-devtools/gcc/libgcc_4.7.bb| 44 + 10 files changed, 280 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch create mode 100644 meta/recipes-devtools/gcc/gcc-multilib-config.inc ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/6] gcc: add missing dependency (zlib)
- add zlib to DEPENDS (it fails otherwise)
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 378caf0..08a0103 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = r13
+PR = r14
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.7.1
@@ -20,7 +20,7 @@ BINV = 4.7.2
FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.7' ], d)}
-DEPENDS =+ mpfr gmp libmpc
+DEPENDS =+ mpfr gmp libmpc zlib
NATIVEDEPS = mpfr-native gmp-native libmpc-native zlib-native
LICENSE=GPL-3.0-with-GCC-exception GPLv3
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/6] gcc: remove the 64bithack patch
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc | 1 -
meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch | 63 ---
2 files changed, 64 deletions(-)
delete mode 100644 meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 08a0103..2fad764 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -50,7 +50,6 @@ SRC_URI = ${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://gcc-poison-system-directories.patch \
file://gcc-poison-dir-extend.patch \
file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
- file://64bithack.patch \
file://optional_libstdc.patch \
file://disable_relax_pic_calls_flag.patch \
file://COLLECT_GCC_OPTIONS.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch
b/meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch
deleted file mode 100644
index f475669..000
--- a/meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-GCC has internal multilib handling code but it assumes a very specific rigid
directory
-layout. The build system implementation of multilib layout is very generic and
allows
-complete customisation of the library directories.
-
-This patch is a partial solution to allow any custom directories to be passed
into gcc
-and handled correctly. It forces gcc to use the base_libdir (which is the
current
-directory, .). We need to do this for each multilib that is configured as we
don't
-know which compiler options may be being passed into the compiler. Since we
have a compiler
-per mulitlib at this point that isn't an issue.
-
-The one problem is the target compiler is only going to work for the default
multlilib at
-this point. Ideally we'd figure out which multilibs were being enabled with
which paths
-and be able to patch these entries with a complete set of correct paths but
this we
-don't have such code at this point. This is something the target gcc recipe
should do
-and override these platform defaults in its build config.
-
-RP 15/8/11
-
-Index: trunk/gcc/config/i386/t-linux64
-===
trunk.orig/gcc/config/i386/t-linux64 2012-02-22 09:44:48.0
-0800
-+++ trunk/gcc/config/i386/t-linux642012-02-22 12:31:01.836462957 -0800
-@@ -33,7 +33,6 @@
- #
- comma=,
- MULTILIB_OPTIONS= $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
--MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo
$(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
--MULTILIB_OSDIRNAMES+= mx32=../libx32
-+MULTILIB_DIRNAMES = . .
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename
$(base_libdir))
-+
-Index: trunk/gcc/config/mips/t-linux64
-===
trunk.orig/gcc/config/mips/t-linux64 2012-02-22 09:44:58.0
-0800
-+++ trunk/gcc/config/mips/t-linux642012-02-22 12:32:01.132465823 -0800
-@@ -17,5 +17,5 @@
- # http://www.gnu.org/licenses/.
-
- MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
--MULTILIB_DIRNAMES = n32 32 64
--MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
-+MULTILIB_DIRNAMES = . . .
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename
$(base_libdir)) ../$(shell basename $(base_libdir))
-Index: trunk/gcc/config/rs6000/t-linux64
-===
trunk.orig/gcc/config/rs6000/t-linux64 2012-02-22 09:44:54.0
-0800
-+++ trunk/gcc/config/rs6000/t-linux64 2012-02-22 12:28:17.960454968 -0800
-@@ -27,9 +27,9 @@
- # MULTILIB_OSDIRNAMES according to what is found on the target.
-
- MULTILIB_OPTIONS= m64/m32 msoft-float
--MULTILIB_DIRNAMES = 64 32 nof
-+MULTILIB_DIRNAMES = . . .
- MULTILIB_EXTRA_OPTS = fPIC mstrict-align
- MULTILIB_EXCEPTIONS = m64/msoft-float
- MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo
$(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell
basename $(base_libdir)) ../$(shell basename $(base_libdir))
- MULTILIB_MATCHES= $(MULTILIB_MATCHES_FLOAT)
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 0/6] On-target multilib gcc enhacement
This patchset enables the user to build gcc with configurable multilib options. The following changes since commit 53cc748b93e8af584557d6db5309c3e955182c5c: linux-libc-headers: fix headers install in long path name environments (2013-01-10 23:53:51 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib cmuscax/gcc_enhan5 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/gcc_enhan4 Constantin Musca (6): gcc: add missing dependency (zlib) gcc: remove the 64bithack patch multilib.conf: add TARGET_ARCH to MULTILIB_SAVE_VARNAME gcc: enable multilib for target gcc tune-mips32: add BASE_LIB to mips32 tunes tune-ppc603e: add BASE_LIB meta/conf/machine/include/tune-mips32.inc | 4 + meta/conf/machine/include/tune-ppc603e.inc | 1 + meta/conf/multilib.conf| 2 +- meta/recipes-devtools/gcc/gcc-4.7.inc | 5 +- meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch | 63 --- meta/recipes-devtools/gcc/gcc-common.inc | 25 +++ meta/recipes-devtools/gcc/gcc-configure-common.inc | 3 +- meta/recipes-devtools/gcc/gcc-configure-target.inc | 1 + meta/recipes-devtools/gcc/gcc-multilib-config.inc | 198 + meta/recipes-devtools/gcc/libgcc_4.7.bb| 44 + 10 files changed, 278 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch create mode 100644 meta/recipes-devtools/gcc/gcc-multilib-config.inc -- 1.7.11.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 5/6] tune-mips32: add BASE_LIB to mips32 tunes
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/conf/machine/include/tune-mips32.inc | 4
1 file changed, 4 insertions(+)
diff --git a/meta/conf/machine/include/tune-mips32.inc
b/meta/conf/machine/include/tune-mips32.inc
index 03cd411..ffbaecf 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/tune-mips32.inc
@@ -9,17 +9,21 @@ TUNE_CCARGS += ${@bb.utils.contains(TUNE_FEATURES,
mips32, -march=mips32,
AVAILTUNES += mips32 mips32el mips32-nf mips32el-nf
TUNE_FEATURES_tune-mips32 = ${TUNE_FEATURES_tune-mips} mips32
+BASE_LIB_tune-mips32 = lib
MIPSPKGSFX_VARIANT_tune-mips32 = mips32
PACKAGE_EXTRA_ARCHS_tune-mips32 = mips mips32
TUNE_FEATURES_tune-mips32el = ${TUNE_FEATURES_tune-mipsel} mips32
+BASE_LIB_tune-mips32el = lib
MIPSPKGSFX_VARIANT_tune-mips32el = mips32el
PACKAGE_EXTRA_ARCHS_tune-mips32el = mipsel mips32el
TUNE_FEATURES_tune-mips32-nf = ${TUNE_FEATURES_tune-mips-nf} mips32
+BASE_LIB_tune-mips32-nf = lib
MIPSPKGSFX_VARIANT_tune-mips32-nf = mips32
PACKAGE_EXTRA_ARCHS_tune-mips32-nf = mips-nf mips32-nf
TUNE_FEATURES_tune-mips32el-nf = ${TUNE_FEATURES_tune-mipsel-nf} mips32
+BASE_LIB_tune-mips32el-nf = lib
MIPSPKGSFX_VARIANT_tune-mips32el-nf = mips32el
PACKAGE_EXTRA_ARCHS_tune-mips32el-nf = mipsel-nf mips32el-nf
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 3/6] multilib.conf: add TARGET_ARCH to MULTILIB_SAVE_VARNAME
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/conf/multilib.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 97b53ec..daa569c 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -2,7 +2,7 @@
baselib = ${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or
'INVALID'), True) or 'lib'}
MULTILIB_VARIANTS = ${@extend_variants(d,'MULTILIBS','multilib')}
-MULTILIB_SAVE_VARNAME = DEFAULTTUNE
+MULTILIB_SAVE_VARNAME = DEFAULTTUNE TARGET_ARCH
MULTILIBS ??= multilib:lib32
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 4/6] gcc: enable multilib for target gcc
- add a task to setup multilib configuration for target gcc
- this commit adapts Nitin Kamble's work to gcc 4.7
- gcc_multilib_setup creates the same patch for all gcc variants
- use a hash for storing the multilib default options
- use a hash for storing arch-dependent multilib options
Tests:
root@qemux86-64:~# gcc -m64 t.c -o t
root@qemux86-64:~# file t
t: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked
(uses shared libs), for GNU/Linux 2.6.16, not stripped
root@qemux86-64:~# ./t
Hello World !
root@qemux86-64:~# gcc -m32 t.c -o t
root@qemux86-64:~# file t
t: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically linked
(uses shared libs), for GNU/Linux 2.6.16, not stripped
root@qemux86-64:~# ./t
Hello World !
[YOCTO #1369]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +-
meta/recipes-devtools/gcc/gcc-common.inc | 25 +++
meta/recipes-devtools/gcc/gcc-configure-common.inc | 3 +-
meta/recipes-devtools/gcc/gcc-configure-target.inc | 1 +
meta/recipes-devtools/gcc/gcc-multilib-config.inc | 198 +
meta/recipes-devtools/gcc/libgcc_4.7.bb| 44 +
6 files changed, 271 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-multilib-config.inc
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 2fad764..13a1e7e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = r14
+PR = r15
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.7.1
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc
b/meta/recipes-devtools/gcc/gcc-common.inc
index 6e64441..8c8168f 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -34,6 +34,29 @@ def get_gcc_multiarch_setting(bb, d):
return multiarch_options[target_arch]
return
+# this is used by the multilib setup of gcc
+def get_tune_parameters(tune, d):
+availtunes = d.getVar('AVAILTUNES', True)
+if tune not in availtunes.split():
+bb.error('The tune: %s is not one of the available tunes: %s', tune,
availtunes)
+
+localdata = bb.data.createCopy(d)
+override = ':tune-' + tune
+localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', False) +
override)
+bb.data.update_data(localdata)
+
+retdict = {}
+retdict['tune'] = tune
+retdict['ccargs'] = localdata.getVar('TUNE_CCARGS', True)
+retdict['features'] = localdata.getVar('TUNE_FEATURES', True)
+retdict['baselib'] = localdata.getVar('BASE_LIB', True)
+retdict['arch'] = localdata.getVar('TUNE_ARCH', True)
+retdict['abiextension'] = localdata.getVar('ABIEXTENSION', True)
+retdict['target_fpu'] = localdata.getVar('TARGET_FPU', True)
+retdict['pkgarch'] = localdata.getVar('TUNE_PKGARCH', True)
+retdict['package_extra_archs'] = localdata.getVar('PACKAGE_EXTRA_ARCHS',
True)
+return retdict
+
# We really need HOST_SYS here for some packages and TARGET_SYS for others.
# For now, libgcc is most important so we fix for that - RP.
SHLIBSDIR = ${STAGING_DIR_TARGET}/shlibs
@@ -62,10 +85,12 @@ SS = ${TMPDIR}/stamps/work-shared/gcc-${PV}-${PR}
do_fetch[stamp-base] = ${SS}
do_unpack[stamp-base] = ${SS}
do_patch[stamp-base] = ${SS}
+do_gcc_multilib_setup[stamp-base] = ${SS}
SSCLEAN = ${TMPDIR}/stamps/work-shared/gcc-[0-9]*-*
do_fetch[stamp-base-clean] = ${SSCLEAN}
do_unpack[stamp-base-clean] = ${SSCLEAN}
do_patch[stamp-base-clean] = ${SSCLEAN}
+do_gcc_multilib_setup[stamp-base-clean] = ${SSCLEAN}
# SW means Shared Work directory
SW = ${TMPDIR}/work-shared/gcc-${PV}-${PR}
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc
b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 4eb59fd..b87ea62 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -1,3 +1,4 @@
+require gcc-multilib-config.inc
#
# Build the list of lanaguages to build.
#
@@ -25,7 +26,7 @@ EXTRA_OECONF_PATHS ?=
EXTRA_OECONF_INITIAL ?=
EXTRA_OECONF_INTERMEDIATE ?=
-GCCMULTILIB = --disable-multilib
+GCCMULTILIB ?= --disable-multilib
GCCTHREADS ?= posix
EXTRA_OECONF = ${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', True)
!= 'no']} \
diff --git a/meta/recipes-devtools/gcc/gcc-configure-target.inc
b/meta/recipes-devtools/gcc/gcc-configure-target.inc
index f41301f..6cc374b 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-target.inc
@@ -1,3 +1,4 @@
+GCCMULTILIB = --enable-multilib
require gcc-configure-common.inc
EXTRA_OECONF_PATHS = \
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
new file mode
[OE-core] [PATCH v3 6/6] tune-ppc603e: add BASE_LIB
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/conf/machine/include/tune-ppc603e.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/conf/machine/include/tune-ppc603e.inc
b/meta/conf/machine/include/tune-ppc603e.inc
index 6557c1d..2cfd342 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -7,6 +7,7 @@ TUNE_CCARGS += ${@bb.utils.contains(TUNE_FEATURES,
ppc603e, -mcpu=603e,
AVAILTUNES += ppc603e
TUNE_FEATURES_tune-ppc603e = m32 fpu-hard ppc603e
+BASE_LIB_tune-ppc603e = lib
TUNE_PKGARCH_tune-ppc603e = ppc603e
PACKAGE_EXTRA_ARCHS_tune-ppc603e = ${PACKAGE_EXTRA_ARCHS_tune-powerpc}
ppc603e
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/6] gcc: add missing dependency (zlib)
- add zlib to DEPENDS (it fails otherwise)
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 378caf0..08a0103 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = r13
+PR = r14
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.7.1
@@ -20,7 +20,7 @@ BINV = 4.7.2
FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.7' ], d)}
-DEPENDS =+ mpfr gmp libmpc
+DEPENDS =+ mpfr gmp libmpc zlib
NATIVEDEPS = mpfr-native gmp-native libmpc-native zlib-native
LICENSE=GPL-3.0-with-GCC-exception GPLv3
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/6] On-target multilib gcc enhacement
This patchset enables the user to build gcc with configurable multilib options. The following changes since commit 53cc748b93e8af584557d6db5309c3e955182c5c: linux-libc-headers: fix headers install in long path name environments (2013-01-10 23:53:51 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib cmuscax/gcc_enhan3 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/gcc_enhan3 Constantin Musca (6): gcc: add missing dependency (zlib) gcc: remove the 64bithack patch multilib.conf: add TARGET_ARCH to MULTILIB_SAVE_VARNAME gcc: enable multilib for target gcc tune-mips32: add BASE_LIB to mips32 tunes tune-ppc603e: add BASE_LIB meta/conf/machine/include/tune-mips32.inc | 4 + meta/conf/machine/include/tune-ppc603e.inc | 1 + meta/conf/multilib.conf| 2 +- meta/recipes-devtools/gcc/gcc-4.7.inc | 5 +- meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch | 63 --- meta/recipes-devtools/gcc/gcc-common.inc | 25 +++ meta/recipes-devtools/gcc/gcc-configure-common.inc | 3 +- meta/recipes-devtools/gcc/gcc-configure-target.inc | 1 + meta/recipes-devtools/gcc/gcc-multilib-config.inc | 200 + meta/recipes-devtools/gcc/libgcc_4.7.bb| 44 + 10 files changed, 280 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch create mode 100644 meta/recipes-devtools/gcc/gcc-multilib-config.inc -- 1.7.11.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/6] gcc: remove the 64bithack patch
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc | 1 -
meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch | 63 ---
2 files changed, 64 deletions(-)
delete mode 100644 meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 08a0103..2fad764 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -50,7 +50,6 @@ SRC_URI = ${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://gcc-poison-system-directories.patch \
file://gcc-poison-dir-extend.patch \
file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
- file://64bithack.patch \
file://optional_libstdc.patch \
file://disable_relax_pic_calls_flag.patch \
file://COLLECT_GCC_OPTIONS.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch
b/meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch
deleted file mode 100644
index f475669..000
--- a/meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-GCC has internal multilib handling code but it assumes a very specific rigid
directory
-layout. The build system implementation of multilib layout is very generic and
allows
-complete customisation of the library directories.
-
-This patch is a partial solution to allow any custom directories to be passed
into gcc
-and handled correctly. It forces gcc to use the base_libdir (which is the
current
-directory, .). We need to do this for each multilib that is configured as we
don't
-know which compiler options may be being passed into the compiler. Since we
have a compiler
-per mulitlib at this point that isn't an issue.
-
-The one problem is the target compiler is only going to work for the default
multlilib at
-this point. Ideally we'd figure out which multilibs were being enabled with
which paths
-and be able to patch these entries with a complete set of correct paths but
this we
-don't have such code at this point. This is something the target gcc recipe
should do
-and override these platform defaults in its build config.
-
-RP 15/8/11
-
-Index: trunk/gcc/config/i386/t-linux64
-===
trunk.orig/gcc/config/i386/t-linux64 2012-02-22 09:44:48.0
-0800
-+++ trunk/gcc/config/i386/t-linux642012-02-22 12:31:01.836462957 -0800
-@@ -33,7 +33,6 @@
- #
- comma=,
- MULTILIB_OPTIONS= $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
--MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo
$(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
--MULTILIB_OSDIRNAMES+= mx32=../libx32
-+MULTILIB_DIRNAMES = . .
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename
$(base_libdir))
-+
-Index: trunk/gcc/config/mips/t-linux64
-===
trunk.orig/gcc/config/mips/t-linux64 2012-02-22 09:44:58.0
-0800
-+++ trunk/gcc/config/mips/t-linux642012-02-22 12:32:01.132465823 -0800
-@@ -17,5 +17,5 @@
- # http://www.gnu.org/licenses/.
-
- MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
--MULTILIB_DIRNAMES = n32 32 64
--MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
-+MULTILIB_DIRNAMES = . . .
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename
$(base_libdir)) ../$(shell basename $(base_libdir))
-Index: trunk/gcc/config/rs6000/t-linux64
-===
trunk.orig/gcc/config/rs6000/t-linux64 2012-02-22 09:44:54.0
-0800
-+++ trunk/gcc/config/rs6000/t-linux64 2012-02-22 12:28:17.960454968 -0800
-@@ -27,9 +27,9 @@
- # MULTILIB_OSDIRNAMES according to what is found on the target.
-
- MULTILIB_OPTIONS= m64/m32 msoft-float
--MULTILIB_DIRNAMES = 64 32 nof
-+MULTILIB_DIRNAMES = . . .
- MULTILIB_EXTRA_OPTS = fPIC mstrict-align
- MULTILIB_EXCEPTIONS = m64/msoft-float
- MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo
$(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell
basename $(base_libdir)) ../$(shell basename $(base_libdir))
- MULTILIB_MATCHES= $(MULTILIB_MATCHES_FLOAT)
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 3/6] multilib.conf: add TARGET_ARCH to MULTILIB_SAVE_VARNAME
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/conf/multilib.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 97b53ec..daa569c 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -2,7 +2,7 @@
baselib = ${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or
'INVALID'), True) or 'lib'}
MULTILIB_VARIANTS = ${@extend_variants(d,'MULTILIBS','multilib')}
-MULTILIB_SAVE_VARNAME = DEFAULTTUNE
+MULTILIB_SAVE_VARNAME = DEFAULTTUNE TARGET_ARCH
MULTILIBS ??= multilib:lib32
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 4/6] gcc: enable multilib for target gcc
- add a task to setup multilib configuration for target gcc
- this commit adapts Nitin Kamble's work to gcc 4.7
- gcc_multilib_setup creates the same patch for all gcc variants
- use a hash for storing the multilib default options
- use a hash for storing arch-dependent multilib options
Tests:
root@qemux86-64:~# gcc -m64 t.c -o t
root@qemux86-64:~# file t
t: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked
(uses shared libs), for GNU/Linux 2.6.16, not stripped
root@qemux86-64:~# ./t
Hello World !
root@qemux86-64:~# gcc -m32 t.c -o t
root@qemux86-64:~# file t
t: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically linked
(uses shared libs), for GNU/Linux 2.6.16, not stripped
root@qemux86-64:~# ./t
Hello World !
[YOCTO #1369]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +-
meta/recipes-devtools/gcc/gcc-common.inc | 25 +++
meta/recipes-devtools/gcc/gcc-configure-common.inc | 3 +-
meta/recipes-devtools/gcc/gcc-configure-target.inc | 1 +
meta/recipes-devtools/gcc/gcc-multilib-config.inc | 200 +
meta/recipes-devtools/gcc/libgcc_4.7.bb| 44 +
6 files changed, 273 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-multilib-config.inc
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 2fad764..13a1e7e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = r14
+PR = r15
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.7.1
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc
b/meta/recipes-devtools/gcc/gcc-common.inc
index 6e64441..8c8168f 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -34,6 +34,29 @@ def get_gcc_multiarch_setting(bb, d):
return multiarch_options[target_arch]
return
+# this is used by the multilib setup of gcc
+def get_tune_parameters(tune, d):
+availtunes = d.getVar('AVAILTUNES', True)
+if tune not in availtunes.split():
+bb.error('The tune: %s is not one of the available tunes: %s', tune,
availtunes)
+
+localdata = bb.data.createCopy(d)
+override = ':tune-' + tune
+localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', False) +
override)
+bb.data.update_data(localdata)
+
+retdict = {}
+retdict['tune'] = tune
+retdict['ccargs'] = localdata.getVar('TUNE_CCARGS', True)
+retdict['features'] = localdata.getVar('TUNE_FEATURES', True)
+retdict['baselib'] = localdata.getVar('BASE_LIB', True)
+retdict['arch'] = localdata.getVar('TUNE_ARCH', True)
+retdict['abiextension'] = localdata.getVar('ABIEXTENSION', True)
+retdict['target_fpu'] = localdata.getVar('TARGET_FPU', True)
+retdict['pkgarch'] = localdata.getVar('TUNE_PKGARCH', True)
+retdict['package_extra_archs'] = localdata.getVar('PACKAGE_EXTRA_ARCHS',
True)
+return retdict
+
# We really need HOST_SYS here for some packages and TARGET_SYS for others.
# For now, libgcc is most important so we fix for that - RP.
SHLIBSDIR = ${STAGING_DIR_TARGET}/shlibs
@@ -62,10 +85,12 @@ SS = ${TMPDIR}/stamps/work-shared/gcc-${PV}-${PR}
do_fetch[stamp-base] = ${SS}
do_unpack[stamp-base] = ${SS}
do_patch[stamp-base] = ${SS}
+do_gcc_multilib_setup[stamp-base] = ${SS}
SSCLEAN = ${TMPDIR}/stamps/work-shared/gcc-[0-9]*-*
do_fetch[stamp-base-clean] = ${SSCLEAN}
do_unpack[stamp-base-clean] = ${SSCLEAN}
do_patch[stamp-base-clean] = ${SSCLEAN}
+do_gcc_multilib_setup[stamp-base-clean] = ${SSCLEAN}
# SW means Shared Work directory
SW = ${TMPDIR}/work-shared/gcc-${PV}-${PR}
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc
b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 4eb59fd..b87ea62 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -1,3 +1,4 @@
+require gcc-multilib-config.inc
#
# Build the list of lanaguages to build.
#
@@ -25,7 +26,7 @@ EXTRA_OECONF_PATHS ?=
EXTRA_OECONF_INITIAL ?=
EXTRA_OECONF_INTERMEDIATE ?=
-GCCMULTILIB = --disable-multilib
+GCCMULTILIB ?= --disable-multilib
GCCTHREADS ?= posix
EXTRA_OECONF = ${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', True)
!= 'no']} \
diff --git a/meta/recipes-devtools/gcc/gcc-configure-target.inc
b/meta/recipes-devtools/gcc/gcc-configure-target.inc
index f41301f..6cc374b 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-target.inc
@@ -1,3 +1,4 @@
+GCCMULTILIB = --enable-multilib
require gcc-configure-common.inc
EXTRA_OECONF_PATHS = \
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
new file mode
[OE-core] [PATCH v2 5/6] tune-mips32: add BASE_LIB to mips32 tunes
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/conf/machine/include/tune-mips32.inc | 4
1 file changed, 4 insertions(+)
diff --git a/meta/conf/machine/include/tune-mips32.inc
b/meta/conf/machine/include/tune-mips32.inc
index 03cd411..ffbaecf 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/tune-mips32.inc
@@ -9,17 +9,21 @@ TUNE_CCARGS += ${@bb.utils.contains(TUNE_FEATURES,
mips32, -march=mips32,
AVAILTUNES += mips32 mips32el mips32-nf mips32el-nf
TUNE_FEATURES_tune-mips32 = ${TUNE_FEATURES_tune-mips} mips32
+BASE_LIB_tune-mips32 = lib
MIPSPKGSFX_VARIANT_tune-mips32 = mips32
PACKAGE_EXTRA_ARCHS_tune-mips32 = mips mips32
TUNE_FEATURES_tune-mips32el = ${TUNE_FEATURES_tune-mipsel} mips32
+BASE_LIB_tune-mips32el = lib
MIPSPKGSFX_VARIANT_tune-mips32el = mips32el
PACKAGE_EXTRA_ARCHS_tune-mips32el = mipsel mips32el
TUNE_FEATURES_tune-mips32-nf = ${TUNE_FEATURES_tune-mips-nf} mips32
+BASE_LIB_tune-mips32-nf = lib
MIPSPKGSFX_VARIANT_tune-mips32-nf = mips32
PACKAGE_EXTRA_ARCHS_tune-mips32-nf = mips-nf mips32-nf
TUNE_FEATURES_tune-mips32el-nf = ${TUNE_FEATURES_tune-mipsel-nf} mips32
+BASE_LIB_tune-mips32el-nf = lib
MIPSPKGSFX_VARIANT_tune-mips32el-nf = mips32el
PACKAGE_EXTRA_ARCHS_tune-mips32el-nf = mipsel-nf mips32el-nf
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 6/6] tune-ppc603e: add BASE_LIB
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/conf/machine/include/tune-ppc603e.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/conf/machine/include/tune-ppc603e.inc
b/meta/conf/machine/include/tune-ppc603e.inc
index 6557c1d..2cfd342 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -7,6 +7,7 @@ TUNE_CCARGS += ${@bb.utils.contains(TUNE_FEATURES,
ppc603e, -mcpu=603e,
AVAILTUNES += ppc603e
TUNE_FEATURES_tune-ppc603e = m32 fpu-hard ppc603e
+BASE_LIB_tune-ppc603e = lib
TUNE_PKGARCH_tune-ppc603e = ppc603e
PACKAGE_EXTRA_ARCHS_tune-ppc603e = ${PACKAGE_EXTRA_ARCHS_tune-powerpc}
ppc603e
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] puzzles: upgrade to r9733
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-sato/puzzles/{puzzles_r9712.bb = puzzles_r9733.bb} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-sato/puzzles/{puzzles_r9712.bb = puzzles_r9733.bb} (100%)
diff --git a/meta/recipes-sato/puzzles/puzzles_r9712.bb
b/meta/recipes-sato/puzzles/puzzles_r9733.bb
similarity index 100%
rename from meta/recipes-sato/puzzles/puzzles_r9712.bb
rename to meta/recipes-sato/puzzles/puzzles_r9733.bb
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] On-target multilib gcc enhancement
This patchset enables the user to build gcc with configurable multilib options. The following changes since commit 7e1f8faad0c4b6f490c26f87acc698dd6e002b15: perl: Remove bashism from perl-tests.inc (2013-01-07 22:37:37 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib cmuscax/gcc_enhan http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/gcc_enhan Constantin Musca (3): gcc: add missing dependency (zlib) gcc: remove the 64bithack patch gcc: enable multilib for target gcc meta/recipes-devtools/gcc/gcc-4.7.inc | 5 +- meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch | 63 -- meta/recipes-devtools/gcc/gcc-common.inc | 23 meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +- meta/recipes-devtools/gcc/gcc-configure-target.inc | 1 + meta/recipes-devtools/gcc/gcc-multilib-config.inc | 132 + meta/recipes-devtools/gcc/libgcc_4.7.bb| 44 +++ 7 files changed, 203 insertions(+), 67 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch create mode 100644 meta/recipes-devtools/gcc/gcc-multilib-config.inc -- 1.7.11.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] gcc: enable multilib for target gcc
- add a task to setup multilib configuration for target gcc
- this commit adapts Nitin Kamble's work to gcc 4.7
Tests:
root@qemux86-64:~# gcc -m64 t.c -o t
root@qemux86-64:~# file t
t: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked
(uses shared libs), for GNU/Linux 2.6.16, not stripped
root@qemux86-64:~# ./t
Hello World !
root@qemux86-64:~# gcc -m32 t.c -o t
root@qemux86-64:~# file t
t: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically linked
(uses shared libs), for GNU/Linux 2.6.16, not stripped
root@qemux86-64:~# ./t
Hello World !
[YOCTO #1369]
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +-
meta/recipes-devtools/gcc/gcc-common.inc | 23
meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +-
meta/recipes-devtools/gcc/gcc-configure-target.inc | 1 +
meta/recipes-devtools/gcc/gcc-multilib-config.inc | 132 +
meta/recipes-devtools/gcc/libgcc_4.7.bb| 44 +++
6 files changed, 202 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-multilib-config.inc
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 2fad764..13a1e7e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = r14
+PR = r15
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.7.1
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc
b/meta/recipes-devtools/gcc/gcc-common.inc
index 6e64441..0d29800 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -34,6 +34,29 @@ def get_gcc_multiarch_setting(bb, d):
return multiarch_options[target_arch]
return
+# this is used by the multilib setup of gcc
+def get_tune_parameters(tune, d):
+availtunes = d.getVar('AVAILTUNES', True)
+if tune not in availtunes.split():
+bb.error('The tune: %s is not one of the available tunes: %s', tune,
availtunes)
+
+localdata = bb.data.createCopy(d)
+override = ':tune-' + tune
+localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', False) +
override)
+bb.data.update_data(localdata)
+
+retdict = {}
+retdict['tune'] = tune
+retdict['ccargs'] = localdata.getVar('TUNE_CCARGS', True)
+retdict['features'] = localdata.getVar('TUNE_FEATURES', True)
+retdict['baselib'] = localdata.getVar('BASE_LIB', True)
+retdict['arch'] = localdata.getVar('TUNE_ARCH', True)
+retdict['abiextension'] = localdata.getVar('ABIEXTENSION', True)
+retdict['target_fpu'] = localdata.getVar('TARGET_FPU', True)
+retdict['pkgarch'] = localdata.getVar('TUNE_PKGARCH', True)
+retdict['package_extra_archs'] = localdata.getVar('PACKAGE_EXTRA_ARCHS',
True)
+return retdict
+
# We really need HOST_SYS here for some packages and TARGET_SYS for others.
# For now, libgcc is most important so we fix for that - RP.
SHLIBSDIR = ${STAGING_DIR_TARGET}/shlibs
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc
b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 4eb59fd..08cc98e 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -25,7 +25,7 @@ EXTRA_OECONF_PATHS ?=
EXTRA_OECONF_INITIAL ?=
EXTRA_OECONF_INTERMEDIATE ?=
-GCCMULTILIB = --disable-multilib
+GCCMULTILIB ?= --disable-multilib
GCCTHREADS ?= posix
EXTRA_OECONF = ${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', True)
!= 'no']} \
diff --git a/meta/recipes-devtools/gcc/gcc-configure-target.inc
b/meta/recipes-devtools/gcc/gcc-configure-target.inc
index f41301f..809f937 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-target.inc
@@ -1,4 +1,5 @@
require gcc-configure-common.inc
+require gcc-multilib-config.inc
EXTRA_OECONF_PATHS = \
--with-sysroot=/ \
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
new file mode 100644
index 000..3d9c026
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
@@ -0,0 +1,132 @@
+GCCMULTILIB = --enable-multilib
+
+addtask gcc_multilib_setup after do_patch before do_configure
+
+# following code modifies these definitions in the gcc config
+#MULTILIB_OPTIONS
+#MULTILIB_DIRNAMES
+#MULTILIB_OSDIRNAMES
+#GLIBC_DYNAMIC_LINKER32
+#GLIBC_DYNAMIC_LINKER64
+#GLIBC_DYNAMIC_LINKERX32
+#GLIBC_DYNAMIC_LINKERN32
+# For more information on use of these variables look at these files in the
gcc source code
+#gcc/config/i386/t-linux64
+#gcc/config/mips/t-linux64
+#gcc/config/rs6000/t-linux64
+#gcc/config/i386/linux64.h
+#gcc/config/mips/linux64.h
+#gcc/config/rs6000/linux64.h
[OE-core] [PATCH 1/3] gcc: add missing dependency (zlib)
- add zlib to DEPENDS (it fails otherwise)
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 378caf0..08a0103 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = r13
+PR = r14
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.7.1
@@ -20,7 +20,7 @@ BINV = 4.7.2
FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.7' ], d)}
-DEPENDS =+ mpfr gmp libmpc
+DEPENDS =+ mpfr gmp libmpc zlib
NATIVEDEPS = mpfr-native gmp-native libmpc-native zlib-native
LICENSE=GPL-3.0-with-GCC-exception GPLv3
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] gcc: remove the 64bithack patch
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc | 1 -
meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch | 63 ---
2 files changed, 64 deletions(-)
delete mode 100644 meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 08a0103..2fad764 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -50,7 +50,6 @@ SRC_URI = ${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://gcc-poison-system-directories.patch \
file://gcc-poison-dir-extend.patch \
file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
- file://64bithack.patch \
file://optional_libstdc.patch \
file://disable_relax_pic_calls_flag.patch \
file://COLLECT_GCC_OPTIONS.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch
b/meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch
deleted file mode 100644
index f475669..000
--- a/meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-GCC has internal multilib handling code but it assumes a very specific rigid
directory
-layout. The build system implementation of multilib layout is very generic and
allows
-complete customisation of the library directories.
-
-This patch is a partial solution to allow any custom directories to be passed
into gcc
-and handled correctly. It forces gcc to use the base_libdir (which is the
current
-directory, .). We need to do this for each multilib that is configured as we
don't
-know which compiler options may be being passed into the compiler. Since we
have a compiler
-per mulitlib at this point that isn't an issue.
-
-The one problem is the target compiler is only going to work for the default
multlilib at
-this point. Ideally we'd figure out which multilibs were being enabled with
which paths
-and be able to patch these entries with a complete set of correct paths but
this we
-don't have such code at this point. This is something the target gcc recipe
should do
-and override these platform defaults in its build config.
-
-RP 15/8/11
-
-Index: trunk/gcc/config/i386/t-linux64
-===
trunk.orig/gcc/config/i386/t-linux64 2012-02-22 09:44:48.0
-0800
-+++ trunk/gcc/config/i386/t-linux642012-02-22 12:31:01.836462957 -0800
-@@ -33,7 +33,6 @@
- #
- comma=,
- MULTILIB_OPTIONS= $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
--MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo
$(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
--MULTILIB_OSDIRNAMES+= mx32=../libx32
-+MULTILIB_DIRNAMES = . .
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename
$(base_libdir))
-+
-Index: trunk/gcc/config/mips/t-linux64
-===
trunk.orig/gcc/config/mips/t-linux64 2012-02-22 09:44:58.0
-0800
-+++ trunk/gcc/config/mips/t-linux642012-02-22 12:32:01.132465823 -0800
-@@ -17,5 +17,5 @@
- # http://www.gnu.org/licenses/.
-
- MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
--MULTILIB_DIRNAMES = n32 32 64
--MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
-+MULTILIB_DIRNAMES = . . .
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename
$(base_libdir)) ../$(shell basename $(base_libdir))
-Index: trunk/gcc/config/rs6000/t-linux64
-===
trunk.orig/gcc/config/rs6000/t-linux64 2012-02-22 09:44:54.0
-0800
-+++ trunk/gcc/config/rs6000/t-linux64 2012-02-22 12:28:17.960454968 -0800
-@@ -27,9 +27,9 @@
- # MULTILIB_OSDIRNAMES according to what is found on the target.
-
- MULTILIB_OPTIONS= m64/m32 msoft-float
--MULTILIB_DIRNAMES = 64 32 nof
-+MULTILIB_DIRNAMES = . . .
- MULTILIB_EXTRA_OPTS = fPIC mstrict-align
- MULTILIB_EXCEPTIONS = m64/msoft-float
- MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo
$(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell
basename $(base_libdir)) ../$(shell basename $(base_libdir))
- MULTILIB_MATCHES= $(MULTILIB_MATCHES_FLOAT)
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] gcc: remove the 64bithack patch
On 01/09/2013 03:45 PM, Richard Purdie wrote: On Wed, 2013-01-09 at 11:00 +0200, Constantin Musca wrote: Signed-off-by: Constantin Musca constantinx.mu...@intel.com --- meta/recipes-devtools/gcc/gcc-4.7.inc | 1 - meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch | 63 --- 2 files changed, 64 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch Does removing this break multilib builds? For example, with different libdir layouts? I think it's going to break other multilib builds. The solution is to keep the 64bithack.patch for setting the default multilib options. The 3/3 patch can be used without PATCH 2/3. Note that gcc has a shared source tree so patches cannot by applied in say the cross case when we need this yet not in the target case when we probably don't want it. We need to make a patch which works in all cases. The other gcc variants (e.g. gcc-cross) are configured using --disable-multilib as option and they will not be influenced if we modify the multilib files. Cheers, Richard Cheers, Constantin ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gsettings-desktop-schemas: add missing elements from meta-gnome
- modify the recipe according to the meta-gnome variant
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb
b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb
index 720858a..d5784af 100644
--- a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb
+++ b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb
@@ -4,12 +4,20 @@ BUGTRACKER = https://bugzilla.gnome.org/;
LICENSE = LGPLv2.1
LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c
+PR = r1
+RDEPENDS_${PN} = glib-2.0-utils
-DEPENDS = glib-2.0
-
-inherit gnome pkgconfig autotools gettext
+inherit gnome
GNOME_COMPRESS_TYPE = xz
SRC_URI[archive.md5sum] = 6dbede8f6112b7e0dd4864e979b91771
SRC_URI[archive.sha256sum] =
1da53e1b960f08ce4b0d472e6f339b7beaf19a7889c15911775abf4efe2ec760
+
+pkg_postinst_${PN} () {
+if [ -n $D ]; then
+exit 1
+fi
+
+glib-compile-schemas ${datadir}/glib-2.0/schemas
+}
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libgdata: remove recipe
Part of the sato trimming process Signed-off-by: Constantin Musca constantinx.mu...@intel.com --- meta/recipes-gnome/gnome/libgdata_0.7.1.bb | 15 --- 1 file changed, 15 deletions(-) delete mode 100644 meta/recipes-gnome/gnome/libgdata_0.7.1.bb diff --git a/meta/recipes-gnome/gnome/libgdata_0.7.1.bb b/meta/recipes-gnome/gnome/libgdata_0.7.1.bb deleted file mode 100644 index c3f4047..000 --- a/meta/recipes-gnome/gnome/libgdata_0.7.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = GLib-based library for accessing online service APIs using the GData protocol -HOMEPAGE = http://live.gnome.org/libgdata; -BUGTRACKER = https://bugzilla.gnome.org/; - -LICENSE = LGPLv2.1 -LIC_FILES_CHKSUM = file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ - file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \ - file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef - -DEPENDS = libxml2 glib-2.0 libsoup-2.4 - -inherit gnome pkgconfig autotools gettext - -SRC_URI[archive.md5sum] = ec5262cbcb07b63b58d45aa3ac636096 -SRC_URI[archive.sha256sum] = fb244138276a5ce98510b0e2408bbf6f9ce0fd8cdcf86f07cd4be38afbb7c2bc -- 1.7.11.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sed: upgrade to 4.2.2
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-extended/sed/{sed_4.2.1.bb = sed_4.2.2.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/sed/{sed_4.2.1.bb = sed_4.2.2.bb} (82%)
diff --git a/meta/recipes-extended/sed/sed_4.2.1.bb
b/meta/recipes-extended/sed/sed_4.2.2.bb
similarity index 82%
rename from meta/recipes-extended/sed/sed_4.2.1.bb
rename to meta/recipes-extended/sed/sed_4.2.2.bb
index 96c509a..8f4e041 100644
--- a/meta/recipes-extended/sed/sed_4.2.1.bb
+++ b/meta/recipes-extended/sed/sed_4.2.2.bb
@@ -4,12 +4,12 @@ LICENSE = GPLv3+
LIC_FILES_CHKSUM = file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://sed/sed.h;beginline=1;endline=17;md5=767ab3a06d7584f6fd0469abaec4412f
SECTION = console/utils
-PR = r5
+PR = r0
SRC_URI = ${GNU_MIRROR}/sed/sed-${PV}.tar.gz
-SRC_URI[md5sum] = f0fd4d7da574d4707e442285fd2d3b86
-SRC_URI[sha256sum] =
8773541ce097fdc4c5b9e7da12a82dffbb30cd91f7bc169f52f05f93b7fc3060
+SRC_URI[md5sum] = 4111de4faa3b9848a0686b2f260c5056
+SRC_URI[sha256sum] =
fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff
inherit autotools update-alternatives gettext
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] gsettings-desktop-schemas: add missing elements from meta-gnome
- add postinst using gsettings.bbclass - modify the recipe according to the meta-gnome variant Signed-off-by: Constantin Musca constantinx.mu...@intel.com --- meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb index 720858a..1242741 100644 --- a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb +++ b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb @@ -4,10 +4,9 @@ BUGTRACKER = https://bugzilla.gnome.org/; LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c +PR = r1 -DEPENDS = glib-2.0 - -inherit gnome pkgconfig autotools gettext +inherit gnome gsettings GNOME_COMPRESS_TYPE = xz -- 1.7.11.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] gsettings-desktop-schemas: add missing elements from meta-gnome
- add postinst using gsettings.bbclass - modify the recipe according to the meta-gnome variant Signed-off-by: Constantin Musca constantinx.mu...@intel.com --- meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb index 720858a..874f9cb 100644 --- a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb +++ b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb @@ -4,10 +4,11 @@ BUGTRACKER = https://bugzilla.gnome.org/; LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c +PR = r1 DEPENDS = glib-2.0 -inherit gnome pkgconfig autotools gettext +inherit gnome gsettings gettext GNOME_COMPRESS_TYPE = xz -- 1.7.11.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] gsettings-desktop-schemas: add missing elements from meta-gnome
On 01/07/2013 03:34 PM, Richard Purdie wrote: On Mon, 2013-01-07 at 14:05 +0200, Constantin Musca wrote: - add postinst using gsettings.bbclass - modify the recipe according to the meta-gnome variant Signed-off-by: Constantin Musca constantinx.mu...@intel.com --- meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb index 720858a..1242741 100644 --- a/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb +++ b/meta/recipes-gnome/gnome/gsettings-desktop-schemas_3.7.3.bb @@ -4,10 +4,9 @@ BUGTRACKER = https://bugzilla.gnome.org/; LICENSE = LGPLv2.1 LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c +PR = r1 -DEPENDS = glib-2.0 It doesn't need glib-2.0? - -inherit gnome pkgconfig autotools gettext +inherit gnome gsettings It doesn't need gettext? Cheers, Richard I removed the dependencies because the original recipe from meta-gnome didn't contain them and gsettings-desktop-schemas builds OK without them. I have checked the gsettings-desktop-schemas autotools files and discovered: PKG_CHECK_EXISTS([gio-2.0 = $GIO_MIN_VERSION],[], [AC_MSG_ERROR([Minimum Gio requirement ($GIO_MIN_VERSION) was not met])]) Also I have discovered that the configure script checks for gettext. I have sent patch v3 which adds back the dependencies. Cheers, Constantin ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] libfm: upgrade to 1.1.0
libfm_fix_for_automake-1.12.patch: removed
- problem not reprodicible anymore
configure_fix.patch: removed
- not used
fix-make-parallelism-issue.patch: added
- assures that the ${includedir}/libfm symlink
is created
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../libfm/libfm-0.1.17/configure_fix.patch | 19 -
.../libfm-0.1.17/libfm_fix_for_automake-1.12.patch | 48 --
.../libfm-1.1.0/fix-make-parallelism-issue.patch | 31 ++
.../libfm/{libfm_0.1.17.bb = libfm_1.1.0.bb} | 8 ++--
4 files changed, 35 insertions(+), 71 deletions(-)
delete mode 100644 meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
delete mode 100644
meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
create mode 100644
meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch
rename meta/recipes-support/libfm/{libfm_0.1.17.bb = libfm_1.1.0.bb} (75%)
diff --git a/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
b/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
deleted file mode 100644
index 351e6e7..000
--- a/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Update configure.ac after docs removed in 0.1.16
-
-Upstream-Status: Pending
-
-Signed-off-by: Zhai Edwin edwin.z...@intel.com
-Index: libfm-0.1.16/configure.ac
-===
libfm-0.1.16.orig/configure.ac 2011-10-10 15:13:21.0 +0800
-+++ libfm-0.1.16/configure.ac 2011-10-10 15:13:30.0 +0800
-@@ -153,9 +153,6 @@
- data/Makefile
- data/ui/Makefile
- po/Makefile.in
--docs/Makefile
--docs/reference/Makefile
--docs/reference/libfm/Makefile
- libfm.pc
- libfm-gtk.pc
- ])
diff --git
a/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
b/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
deleted file mode 100644
index 3efb4dd..000
--- a/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Upstream-Status: Pending
-
-This patch fixes following kind of issues with automake 1.12
-| automake: warnings are treated as errors
-| data/ui/Makefile.am:21: warning: '%'-style pattern rules are a GNU make
extension
-...
-|
/srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am:
warning: 'libfm-gtk.la': linking libtool libraries using a non-POSIX
-|
/srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am:
archiver requires 'AM_PROG_AR' in 'configure.ac'
-...
-| src/Makefile.am:21: warning: compiling 'glib-compat.c' with per-target flags
requires 'AM_PROG_CC_C_O' in 'configure.ac'
-
-Signed-Off-By: Nitin A Kamble nitin.a.kam...@intel.com
-2012/05/03
-
-Index: libfm-0.1.17/configure.ac
-===
libfm-0.1.17.orig/configure.ac
-+++ libfm-0.1.17/configure.ac
-@@ -4,11 +4,17 @@
- AC_PREREQ([2.63])
- AC_INIT([libfm], [0.1.17], [http://pcmanfm.sorceforge.net/])
- AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+
-+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-+m4_pattern_allow([AM_PROG_AR])
-+AM_PROG_AR
-+
- AC_CONFIG_MACRO_DIR(m4)
- AC_CONFIG_HEADERS([config.h])
-
- # Checks for programs.
- AC_PROG_CC
-+AM_PROG_CC_C_O
- AM_PROG_LIBTOOL
-
- # Checks for libraries.
-Index: libfm-0.1.17/data/ui/Makefile.am
-===
libfm-0.1.17.orig/data/ui/Makefile.am
-+++ libfm-0.1.17/data/ui/Makefile.am
-@@ -18,6 +18,6 @@ EXTRA_DIST = \
- $(NULL)
-
- # Purge GtkBuilder UI files
--%.ui: %.glade
-+.glade.ui:
- cp $ $@
- $(top_builddir)/src/xml-purge $@
diff --git
a/meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch
b/meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch
new file mode 100644
index 000..5d39d19
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch
@@ -0,0 +1,31 @@
+Fix make parallelism issue
+
+- remove pkginclude_HEADERS ( LIBFM_INCLUDES and LIBFM_GTK_INCLUDES
+variables are empty)
+- if we don't remove it then we will have a race condition between the code
+that tries to symlink ${includedir}/libfm-1.0 to ${includedir}/libfm and the
+am autogenerated code from the pkginclude_HEADERS definition which
+tries to create pkgincludedir (${includedir}/libfm);
+- if pkgincludedir is created before the symlink the symlink will be created
+in the ${includedir}/libfm dir and it will have libfm-1.0 as name which is
+wrong (we need the ${includedir}/libfm symlink for pcmanfm)
+
+Upstream-Status: Pending
+Signed-off-by: Constantin Musca constantinx.mu...@intel.com
+
+Index: libfm-1.1.0/src/Makefile.am
Re: [OE-core] [PATCH v2] libfm: upgrade to 1.1.0
On 12/27/2012 07:52 PM, Saul Wold wrote:
On 12/27/2012 06:39 AM, Constantin Musca wrote:
libfm_fix_for_automake-1.12.patch: removed
- problem not reprodicible anymore
configure_fix.patch: removed
- not used
[Other changes]
- create a symbolic link from ${includedir}/libfm-1.0 to
${includedir}/libfm (this is where pcmanfm looks)
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../libfm/libfm-0.1.17/configure_fix.patch | 19 -
.../libfm-0.1.17/libfm_fix_for_automake-1.12.patch | 48
--
.../libfm/{libfm_0.1.17.bb = libfm_1.1.0.bb} | 14 +--
3 files changed, 10 insertions(+), 71 deletions(-)
delete mode 100644
meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
delete mode 100644
meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
rename meta/recipes-support/libfm/{libfm_0.1.17.bb =
libfm_1.1.0.bb} (71%)
diff --git
a/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
b/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
deleted file mode 100644
index 351e6e7..000
--- a/meta/recipes-support/libfm/libfm-0.1.17/configure_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Update configure.ac after docs removed in 0.1.16
-
-Upstream-Status: Pending
-
-Signed-off-by: Zhai Edwin edwin.z...@intel.com
-Index: libfm-0.1.16/configure.ac
-===
libfm-0.1.16.orig/configure.ac2011-10-10 15:13:21.0
+0800
-+++ libfm-0.1.16/configure.ac2011-10-10 15:13:30.0 +0800
-@@ -153,9 +153,6 @@
- data/Makefile
- data/ui/Makefile
- po/Makefile.in
--docs/Makefile
--docs/reference/Makefile
--docs/reference/libfm/Makefile
- libfm.pc
- libfm-gtk.pc
- ])
diff --git
a/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
b/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
deleted file mode 100644
index 3efb4dd..000
---
a/meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Upstream-Status: Pending
-
-This patch fixes following kind of issues with automake 1.12
-| automake: warnings are treated as errors
-| data/ui/Makefile.am:21: warning: '%'-style pattern rules are a GNU
make extension
-...
-|
/srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am:
warning: 'libfm-gtk.la': linking libtool libraries using a non-POSIX
-|
/srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am:
archiver requires 'AM_PROG_AR' in 'configure.ac'
-...
-| src/Makefile.am:21: warning: compiling 'glib-compat.c' with
per-target flags requires 'AM_PROG_CC_C_O' in 'configure.ac'
-
-Signed-Off-By: Nitin A Kamble nitin.a.kam...@intel.com
-2012/05/03
-
-Index: libfm-0.1.17/configure.ac
-===
libfm-0.1.17.orig/configure.ac
-+++ libfm-0.1.17/configure.ac
-@@ -4,11 +4,17 @@
- AC_PREREQ([2.63])
- AC_INIT([libfm], [0.1.17], [http://pcmanfm.sorceforge.net/])
- AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+
-+# automake 1.12 seems to require this, but automake 1.11 doesn't
recognize it
-+m4_pattern_allow([AM_PROG_AR])
-+AM_PROG_AR
-+
- AC_CONFIG_MACRO_DIR(m4)
- AC_CONFIG_HEADERS([config.h])
-
- # Checks for programs.
- AC_PROG_CC
-+AM_PROG_CC_C_O
- AM_PROG_LIBTOOL
-
- # Checks for libraries.
-Index: libfm-0.1.17/data/ui/Makefile.am
-===
libfm-0.1.17.orig/data/ui/Makefile.am
-+++ libfm-0.1.17/data/ui/Makefile.am
-@@ -18,6 +18,6 @@ EXTRA_DIST = \
- $(NULL)
-
- # Purge GtkBuilder UI files
--%.ui: %.glade
-+.glade.ui:
- cp $ $@
- $(top_builddir)/src/xml-purge $@
diff --git a/meta/recipes-support/libfm/libfm_0.1.17.bb
b/meta/recipes-support/libfm/libfm_1.1.0.bb
similarity index 71%
rename from meta/recipes-support/libfm/libfm_0.1.17.bb
rename to meta/recipes-support/libfm/libfm_1.1.0.bb
index 2cac361..95a2ca0 100644
--- a/meta/recipes-support/libfm/libfm_0.1.17.bb
+++ b/meta/recipes-support/libfm/libfm_1.1.0.bb
@@ -10,16 +10,22 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
SECTION = x11/libs
DEPENDS = glib-2.0 pango gtk+ menu-cache intltool-native
-PR = r4
+PR = r0
SRC_URI = ${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
- file://libfm_fix_for_automake-1.12.patch \
-SRC_URI[md5sum] = a97e03d973e6ac727f28d0934d6c9ad5
-SRC_URI[sha256sum] =
1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b
+SRC_URI[md5sum] = a5bc8b8291cf810c659bfb3af378b5de
+SRC_URI[sha256sum] =
b9426e588670b53570b808c49abd1d103863614dd3622559b8c3ef1392fe0b3d
inherit autotools pkgconfig
+do_install_append() {
+cd ${D}/${includedir}
+rm -rf ${BPN}
+ln -s ${BPN}-1.0 ${BPN}
+cd ${S}
+}
This is not the correct way
[OE-core] [PATCH 1/6] libpam: enable multilib
Fix the following warning:
WARNING: QA Issue: lib32-libpam: Files/directories were installed but not
shipped
/usr/sbin/unix_chkpwd
/usr/sbin/pam_tally2
/usr/sbin/mkhomedir_helper
/usr/sbin/unix_update
/usr/sbin/pam_timestamp_check
/usr/sbin/pam_tally
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-extended/pam/libpam_1.1.6.bb | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb
b/meta/recipes-extended/pam/libpam_1.1.6.bb
index fae0467..93c98c0 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -30,7 +30,7 @@ EXTRA_OECONF = --with-db-uniquename=_pam \
CFLAGS_append = -fPIC
-PR = r1
+PR = r2
S = ${WORKDIR}/Linux-PAM-${PV}
@@ -66,12 +66,13 @@ python populate_packages_prepend () {
pam_filterdir = d.expand('${base_libdir}/security/pam_filter')
do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM
plugin for %s', extra_depends='')
-pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_chkpwd')
-pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_update')
-pam_plugin_append_file('pam-plugin-tally', pam_sbindir, 'pam_tally')
-pam_plugin_append_file('pam-plugin-tally2', pam_sbindir, 'pam_tally2')
-pam_plugin_append_file('pam-plugin-timestamp', pam_sbindir,
'pam_timestamp_check')
-pam_plugin_append_file('pam-plugin-mkhomedir', pam_sbindir,
'mkhomedir_helper')
+mlprefix = d.getVar('MLPREFIX', True) or ''
+pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir,
'unix_chkpwd')
+pam_plugin_append_file('%spam-plugin-unix' % mlprefix, pam_sbindir,
'unix_update')
+pam_plugin_append_file('%spam-plugin-tally' % mlprefix, pam_sbindir,
'pam_tally')
+pam_plugin_append_file('%spam-plugin-tally2' % mlprefix, pam_sbindir,
'pam_tally2')
+pam_plugin_append_file('%spam-plugin-timestamp' % mlprefix, pam_sbindir,
'pam_timestamp_check')
+pam_plugin_append_file('%spam-plugin-mkhomedir' % mlprefix, pam_sbindir,
'mkhomedir_helper')
do_split_packages(d, pam_filterdir, '^(.*)$', 'pam-filter-%s', 'PAM filter
for %s', extra_depends='')
}
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] Multilib fixes
This is another set of multilib fixes.
The following changes since commit 4a36a32567ecfbc7ce7b967803e6e23314953ef5:
libpng: fix packaging (2012-12-26 11:34:09 +)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib cmuscax/multilib4
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/multilib4
Constantin Musca (6):
libpam: enable multilib
vte: add missing unpackaged files
package.bbclass: don't prepend MLPREFIX to LOCALEBASEPN
eglibc-locale: enable multilib
sysstat: fix sa_lib_dir
rpm: replace /usr/lib with ${libdir}
meta/classes/package.bbclass | 2 +-
meta/recipes-core/eglibc/eglibc-locale.inc | 4 ++--
meta/recipes-devtools/rpm/rpm_5.4.9.bb | 4 ++--
meta/recipes-extended/pam/libpam_1.1.6.bb | 15 ---
meta/recipes-extended/sysstat/sysstat.inc | 6 +-
meta/recipes-support/vte/vte.inc | 3 ++-
meta/recipes-support/vte/vte_0.28.2.bb | 2 +-
7 files changed, 21 insertions(+), 15 deletions(-)
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] vte: add missing unpackaged files
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-support/vte/vte.inc | 3 ++-
meta/recipes-support/vte/vte_0.28.2.bb | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 0766da7..2d4e9aa 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -10,5 +10,6 @@ EXTRA_OECONF = --disable-python --disable-introspection
PACKAGES =+ libvte vte-termcap
FILES_libvte = ${libdir}/*.so.* ${libexecdir}/gnome-pty-helper
-FILES_vte-dbg =+ ${libexecdir}/.debug
+FILES_vte-dbg =+ ${libexecdir}/.debug ${prefix}/src ${bindir}/.debug \
+ ${libdir}/.debug
FILES_vte-termcap = ${datadir}/vte/termcap-0.0
diff --git a/meta/recipes-support/vte/vte_0.28.2.bb
b/meta/recipes-support/vte/vte_0.28.2.bb
index 1fe66e7..9ad4a96 100644
--- a/meta/recipes-support/vte/vte_0.28.2.bb
+++ b/meta/recipes-support/vte/vte_0.28.2.bb
@@ -2,7 +2,7 @@ require vte.inc
LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7
-PR = r5
+PR = r6
SRC_URI[archive.md5sum] = f07a4bf943194f94b7f142db8f7f36dc
SRC_URI[archive.sha256sum] =
8d04e202b617373dfb47689e5e628febe2c58840b344af4feb88c48df903
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] package.bbclass: don't prepend MLPREFIX to LOCALEBASEPN
- all the recipes that overwrite LOCALEBASEPN must consider
also the MLPREFIX
- if the LOCALEBASEPN variable is not overwritten then it will
have the correct prefix (LOCALEBASEPN ??= ${PN})
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/classes/package.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 9885d94..8a94e30 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -438,7 +438,7 @@ python package_do_split_locales() {
return
dvar = d.getVar('PKGD', True)
-pn = %s%s % (d.getVar('MLPREFIX', True) or , d.getVar('LOCALEBASEPN',
True))
+pn = d.getVar('LOCALEBASEPN', True)
if pn + '-locale' in packages:
packages.remove(pn + '-locale')
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] eglibc-locale: enable multilib
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
meta/recipes-core/eglibc/eglibc-locale.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc
b/meta/recipes-core/eglibc/eglibc-locale.inc
index 0381e26..d2b23de 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -1,7 +1,7 @@
include eglibc-collateral.inc
BPN = eglibc
-LOCALEBASEPN = eglibc
+LOCALEBASEPN = ${MLPREFIX}eglibc
# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
# is set. The idea is to avoid running localedef on the target (at first boot)
@@ -20,7 +20,7 @@ BINARY_LOCALE_ARCHES ?= arm.* i[3-6]86 x86_64 powerpc mips
mips64
# set 0 for qemu emulation of native localedef for locale generation
LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = 1
-PR = r22
+PR = r23
PROVIDES = virtual/libc-locale
--
1.7.11.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
