[OE-core] [PATCH 1/1] runqemu-internal: get rid of annoying but harmless error message
If tap0 interface has been created by other users on the system, we would get error messages when using runqemu. Error messages are like below. Acquiring lockfile for tap0... touch: cannot touch ‘/tmp/qemu-tap-locks/tap0.lock’: Permission denied /buildarea2/chenqi/poky/scripts/runqemu-internal: line 139: /tmp/qemu-tap-locks/tap0.lock: Permission denied flock: 8: Bad file descriptor The system can still boot up because runqemu would try to create a new tap interface. So the error message above is harmless, yet somewhat annoying. This patch fixes the above problem. With this patch, the output would be as follows. Acquiring lockfile for tap0... Acquiring lockfile for /tmp/qemu-tap-locks/tap0.lock failed Setting up tap interface under sudo Acquiring lockfile for tap1... Running qemu-system-arm... Signed-off-by: Chen Qi --- scripts/runqemu-internal | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 5711bd3..a0a1e96 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -138,7 +138,11 @@ else return 1 fi -touch $lockfile.lock +touch $lockfile.lock 2>/dev/null +if [ $? -ne 0 ]; then +echo "Acquiring lockfile for $lockfile.lock failed" +return 1 +fi exec 8>$lockfile.lock flock -n -x 8 if [ $? -ne 0 ]; then -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] runqemu-internal: get rid of annoying but harmless error message
The following changes since commit 2a775ebbb175dd70fc7228607c306d4ccb9e4ba4: net-tools: Fix rerunning of do_patch task (2015-01-23 14:32:40 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/runqemu-internal-error-message http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/runqemu-internal-error-message Chen Qi (1): runqemu-internal: get rid of annoying but harmless error message scripts/runqemu-internal | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: Backports fixes to 216
Fix systemd-timesyncd assertion
when networkd is disabled then we now do not
create /run/systemd/netif/links but timesyncd needs it. So lets
manually create this file when networkd is disabled so timesyncd
can still function
When enabling systemd-timesyncd we need systemd-timesync user
Backport patches to enable timesyncd when resolved and networkd
are disabled
replace the resolv.conf symlinink patch with a proper backport
Change-Id: I53f1a53eec4e4a4dbdfb7e8cd155d544ee5d81ec
Signed-off-by: Khem Raj
---
...onfigure-the-list-of-system-users-files-a.patch | 175 +
...o-not-install-tmpfiles-and-sysusers-files.patch | 53 +++
...ke-resolv.conf-entry-conditional-on-resol.patch | 141 +
...es.d-etc.conf-disable-resolv.conf-symlink.patch | 35 -
meta/recipes-core/systemd/systemd_216.bb | 12 +-
5 files changed, 379 insertions(+), 37 deletions(-)
create mode 100644
meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch
create mode 100644
meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch
create mode 100644
meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch
diff --git
a/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch
b/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch
new file mode 100644
index 000..c0febd3
--- /dev/null
+++
b/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch
@@ -0,0 +1,175 @@
+From 5a16bc264c32237e38a844d55e7a1820a31b8440 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Stelmach?=
+Date: Fri, 28 Nov 2014 15:59:59 +0100
+Subject: [PATCH] build-sys: configure the list of system users, files and
+ directories
+
+Choose which system users defined in sysusers.d/systemd.conf and files
+or directories in tmpfiles.d/systemd.conf, should be provided depending
+on comile-time configuration.
+
+Upstream-Status: Backport
+---
+ Makefile.am | 4
+ configure.ac | 2 ++
+ sysusers.d/.gitignore| 1 +
+ sysusers.d/{systemd.conf => systemd.conf.m4} | 8
+ tmpfiles.d/.gitignore| 3 ++-
+ tmpfiles.d/{systemd.conf => systemd.conf.m4} | 2 ++
+ 6 files changed, 19 insertions(+), 1 deletion(-)
+ rename sysusers.d/{systemd.conf => systemd.conf.m4} (77%)
+ rename tmpfiles.d/{systemd.conf => systemd.conf.m4} (96%)
+
+Index: git/Makefile.am
+===
+--- git.orig/Makefile.am 2015-01-23 21:23:04.0 +
git/Makefile.am2015-01-23 21:23:04.0 +
+@@ -5698,6 +5698,10 @@
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
+
++sysusers.d/%: sysusers.d/%.m4
++ $(AM_V_at)$(MKDIR_P) $(dir $@)
++ $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
++
+ tmpfiles.d/%: tmpfiles.d/%.m4
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
+Index: git/configure.ac
+===
+--- git.orig/configure.ac 2015-01-23 21:23:04.0 +
git/configure.ac 2015-01-23 21:23:04.0 +
+@@ -971,6 +971,7 @@
+ AC_ARG_ENABLE(timesyncd, AS_HELP_STRING([--disable-timesyncd], [disable
timesync daemon]))
+ if test "x$enable_timesyncd" != "xno"; then
+ have_timesyncd=yes
++M4_DEFINES="$M4_DEFINES -DENABLE_TIMESYNCD"
+ fi
+ AM_CONDITIONAL(ENABLE_TIMESYNCD, [test "$have_timesyncd" = "yes"])
+
+@@ -1060,6 +1061,7 @@
+ AS_IF([test "x$enable_networkd" != "xno"], [
+ AC_DEFINE(ENABLE_NETWORKD, 1, [Define if networkd support is to be
enabled])
+ have_networkd=yes
++M4_DEFINES="$M4_DEFINES -DENABLE_NETWORKD"
+ ])
+ AM_CONDITIONAL(ENABLE_NETWORKD, [test "x$have_networkd" = "xyes"])
+
+Index: git/sysusers.d/systemd.conf
+===
+--- git.orig/sysusers.d/systemd.conf 2015-01-23 21:23:02.0 +
/dev/null 1970-01-01 00:00:00.0 +
+@@ -1,12 +0,0 @@
+-# This file is part of systemd.
+-#
+-# systemd is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU Lesser General Public License as published by
+-# the Free Software Foundation; either version 2.1 of the License, or
+-# (at your option) any later version.
+-
+-g systemd-journal - -
+-u systemd-bus-proxy - "systemd Bus Proxy"
+-u systemd-network - "systemd Network Management"
+-u systemd-resolve - "systemd Resolver"
+-u systemd-timesync - "systemd Time Synchronization"
+Index: git/sysusers.d/systemd.conf.
[OE-core] [oe-core][PATCH] libidn_0.6.14: fix the QA Issue
To fix the QA Issue as following:
ERROR: QA Issue: libidn: Files/directories were installed but not shipped
/usr/share/emacs
/usr/share/emacs/site-lisp
/usr/share/emacs/site-lisp/punycode.el
/usr/share/emacs/site-lisp/idna.el [installed-vs-shipped]
Signed-off-by: Lei Maohui
---
meta/recipes-extended/libidn/libidn_0.6.14.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-extended/libidn/libidn_0.6.14.bb
b/meta/recipes-extended/libidn/libidn_0.6.14.bb
index ff8d345..4df1d08 100644
--- a/meta/recipes-extended/libidn/libidn_0.6.14.bb
+++ b/meta/recipes-extended/libidn/libidn_0.6.14.bb
@@ -29,4 +29,5 @@ do_configure_prepend() {
do_install_append() {
rm -rf ${D}${libdir}/Libidn.dll
+ rm -rf ${D}${datadir}/emacs
}
--
1.8.4.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] package_manager.py: fix rootfs failure for package_deb with multilib enabled
The following changes since commit 2a775ebbb175dd70fc7228607c306d4ccb9e4ba4: net-tools: Fix rerunning of do_patch task (2015-01-23 14:32:40 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/debian-multilib http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/debian-multilib Chen Qi (1): package_manager.py: fix rootfs failure with multilib enabled meta/lib/oe/package_manager.py | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] package_manager.py: fix rootfs failure with multilib enabled
With the current code, if we use debian package backend and enable
multilib support, the do_rootfs process would always fail with error
messages like below.
E: Unable to locate package packagegroup-core-boot
This patch fixes the above problem.
Signed-off-by: Chen Qi
---
meta/lib/oe/package_manager.py | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 69100f1..6f49c69 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1723,9 +1723,12 @@ class DpkgPM(PackageManager):
with
open(self.d.expand("${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample")) as
apt_conf_sample:
for line in apt_conf_sample.read().split("\n"):
match_arch = re.match(" Architecture \".*\";$", line)
+architectures = ""
if match_arch:
for base_arch in base_arch_list:
-apt_conf.write(" Architecture \"%s\";\n" %
base_arch)
+architectures += "\"%s\";" % base_arch
+apt_conf.write(" Architectures {%s};\n" %
architectures);
+apt_conf.write(" Architecture \"%s\";\n" % base_archs)
else:
line = re.sub("#ROOTFS#", self.target_rootfs, line)
line = re.sub("#APTCONF#", self.apt_conf_dir, line)
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][RFC] insane.bbclass: Enhance file-rdeps QA check
This is a proposed solution for [YOCTO #7126]
For the first item , I simply added the symlink-to-sysroot check to the QA_WARN
this gave me the QA warning as I belive it was supposed to.
For the second item, I changed filerdepends from set() to dict(), hence methods
for adding or deleting items had to change, I believe dicts are slower than sets
but I had to keep track of the key:value relationship, since sets are unordered
a better way didnt occur to me, all this to flag the issue along with the
offending file accordingly, due to this rdep_rprovides isnt needed anymore.
Signed-off-by: Alejandro Hernandez
---
meta/classes/insane.bbclass | 26 +++---
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 143ec46..542346a 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -34,7 +34,7 @@ WARN_QA ?= "ldflags useless-rpaths rpaths staticdev libdir
xorg-driver-abi \
ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \
perms dep-cmp pkgvarcheck perm-config perm-line perm-link \
split-strip packages-list pkgv-undefined var-undefined \
-version-going-backwards \
+version-going-backwards symlink-to-sysroot\
"
ALL_QA = "${WARN_QA} ${ERROR_QA}"
@@ -604,7 +604,6 @@ def package_qa_check_symlink_to_sysroot(path, name, d, elf,
messages):
if target.startswith(tmpdir):
trimmed = path.replace(os.path.join (d.getVar("PKGDEST",
True), name), "")
messages["symlink-to-sysroot"] = "Symlink %s in %s points to
TMPDIR" % (trimmed, name)
-
def package_qa_check_license(workdir, d):
"""
Check for changes in the license files
@@ -803,13 +802,14 @@ def package_qa_check_rdepends(pkg, pkgdest, skip,
taskdeps, packages, d):
if bb.data.inherits_class('nativesdk', d):
ignored_file_rdeps |= set(['/bin/bash', '/usr/bin/perl'])
# For Saving the FILERDEPENDS
-filerdepends = set()
+filerdepends = {}
rdep_data = oe.packagedata.read_subpkgdata(pkg, d)
for key in rdep_data:
if key.startswith("FILERDEPENDS_"):
for subkey in rdep_data[key].split():
-filerdepends.add(subkey)
-filerdepends -= ignored_file_rdeps
+if subkey not in ignored_file_rdeps:
+# We already know it starts with FILERDEPENDS_
+filerdepends[subkey] = key[13:]
if filerdepends:
next = rdepends
@@ -841,31 +841,27 @@ def package_qa_check_rdepends(pkg, pkgdest, skip,
taskdeps, packages, d):
# case there is a RDEPENDS_pkg = "python" in the recipe.
for py in [ d.getVar('MLPREFIX', True) + "python", "python" ]:
if py in done:
-filerdepends.discard("/usr/bin/python")
+filerdepends.pop("/usr/bin/python",None)
done.remove(py)
for rdep in done:
# For Saving the FILERPROVIDES, RPROVIDES and FILES_INFO
-rdep_rprovides = set()
rdep_data = oe.packagedata.read_subpkgdata(rdep, d)
for key in rdep_data:
if key.startswith("FILERPROVIDES_") or
key.startswith("RPROVIDES_"):
for subkey in rdep_data[key].split():
-rdep_rprovides.add(subkey)
+filerdepends.pop(subkey,None)
# Add the files list to the rprovides
if key == "FILES_INFO":
# Use eval() to make it as a dict
for subkey in eval(rdep_data[key]):
-rdep_rprovides.add(subkey)
-filerdepends -= rdep_rprovides
+filerdepends.pop(subkey,None)
if not filerdepends:
# Break if all the file rdepends are met
break
-else:
-# Clear it for the next loop
-rdep_rprovides.clear()
if filerdepends:
-error_msg = "%s requires %s, but no providers in its RDEPENDS"
% \
-(pkg, ', '.join(str(e) for e in filerdepends))
+for key in filerdepends:
+error_msg = "%s contained in package %s requires %s, but
no providers found in its RDEPENDS" % \
+(filerdepends[key],pkg, key)
sane = package_qa_handle_error("file-rdeps", error_msg, d)
return sane
--
1.9.1
--
___
Openembedded-core mail
Re: [OE-core] [PATCH 0/2] kmod new packageconfig and dbus split package
On 28 January 2015 at 18:55, Dan McGregor wrote: > Is there a public place to see what you have queued? > Sure it, ross/mut in poky-contrib. As often seen on the autobuilder in all red. :) Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] kmod new packageconfig and dbus split package
On 28 January 2015 at 10:00, Burton, Ross wrote: > > On 28 January 2015 at 15:47, Bottazzini, Bruno > wrote: >> >> Guys, were you able to look at this patch ? > > > Yep, it's queued. Is there a public place to see what you have queued? -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5 V2] pigz: Upgrade to 2.3.3
Fix build issues due to libz being required but
is specified before use.
Change-Id: I1f26c8e656b330a4b5f1eeffee7ac13500fa98d0
Signed-off-by: Khem Raj
---
meta/recipes-extended/pigz/pigz.inc| 24 +++---
meta/recipes-extended/pigz/pigz/link-order.patch | 38 ++
.../pigz/{pigz_2.3.1.bb => pigz_2.3.3.bb} | 6 ++--
3 files changed, 54 insertions(+), 14 deletions(-)
create mode 100644 meta/recipes-extended/pigz/pigz/link-order.patch
rename meta/recipes-extended/pigz/{pigz_2.3.1.bb => pigz_2.3.3.bb} (51%)
diff --git a/meta/recipes-extended/pigz/pigz.inc
b/meta/recipes-extended/pigz/pigz.inc
index d313f2f..b5caa95 100644
--- a/meta/recipes-extended/pigz/pigz.inc
+++ b/meta/recipes-extended/pigz/pigz.inc
@@ -7,23 +7,23 @@ HOMEPAGE = "http://zlib.net/pigz/";
SECTION = "console/utils"
LICENSE = "Zlib & Apache-2.0"
-SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz";
+SRC_URI = "http://zlib.net/${BPN}/${BP}.tar.gz";
PROVIDES_class-native += "gzip-native"
DEPENDS = "zlib"
-do_install () {
- if [ "${CLASSOVERRIDE}" = "class-target" ] ; then
- # Install files into /bin (FHS), which is typical place for gzip
- install -d ${D}${base_bindir}
- install ${B}/pigz ${D}${base_bindir}/gzip
- install ${B}/unpigz ${D}${base_bindir}/gunzip
- else
- install -d ${D}${bindir}
- install ${B}/pigz ${D}${bindir}/gzip
- install ${B}/unpigz ${D}${bindir}/gunzip
- fi
+do_install_class-target() {
+ # Install files into /bin (FHS), which is typical place for gzip
+ install -d ${D}${base_bindir}
+ install ${B}/pigz ${D}${base_bindir}/gzip
+ install ${B}/unpigz ${D}${base_bindir}/gunzip
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install ${B}/pigz ${D}${bindir}/gzip
+ install ${B}/unpigz ${D}${bindir}/gunzip
}
ALTERNATIVE_${PN} = "gzip gunzip"
diff --git a/meta/recipes-extended/pigz/pigz/link-order.patch
b/meta/recipes-extended/pigz/pigz/link-order.patch
new file mode 100644
index 000..4becc0e
--- /dev/null
+++ b/meta/recipes-extended/pigz/pigz/link-order.patch
@@ -0,0 +1,38 @@
+This patch avoids underlinking issues since we pass -lz via LDFLAGS but it
appears
+before pigz.o which needs symbols from libz however due to order linker
happily discards libz
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj
+
+Index: pigz-2.3.3/Makefile
+===
+--- pigz-2.3.3.orig/Makefile 2015-01-19 20:12:31.0 -0800
pigz-2.3.3/Makefile2015-01-28 09:11:50.29184 -0800
+@@ -5,7 +5,7 @@
+ # use gcc and gmake on Solaris
+
+ pigz: pigz.o yarn.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o
${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o
${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o
+- $(CC) $(LDFLAGS) -o pigz $^ -lpthread -lm
++ $(CC) -o pigz $^ $(LDFLAGS) -lz -lpthread -lm
+ ln -f pigz unpigz
+
+ pigz.o: pigz.c yarn.h try.h ${ZOPFLI}deflate.h ${ZOPFLI}util.h
+@@ -35,7 +35,7 @@
+ dev: pigz pigzt pigzn
+
+ pigzt: pigzt.o yarnt.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o
${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o
${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o
+- $(CC) $(LDFLAGS) -o pigzt $^ -lpthread -lm
++ $(CC) -o pigzt $^ $(LDFLAGS) -lz -lpthread -lm
+
+ pigzt.o: pigz.c yarn.h try.h
+ $(CC) $(CFLAGS) -DDEBUG -g -c -o pigzt.o pigz.c
+@@ -44,7 +44,7 @@
+ $(CC) $(CFLAGS) -DDEBUG -g -c -o yarnt.o yarn.c
+
+ pigzn: pigzn.o tryn.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o
${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o
${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o
+- $(CC) $(LDFLAGS) -o pigzn $^ -lm
++ $(CC) -o pigzn $^ $(LDFLAGS) -lz -lm
+
+ pigzn.o: pigz.c try.h
+ $(CC) $(CFLAGS) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c
diff --git a/meta/recipes-extended/pigz/pigz_2.3.1.bb
b/meta/recipes-extended/pigz/pigz_2.3.3.bb
similarity index 51%
rename from meta/recipes-extended/pigz/pigz_2.3.1.bb
rename to meta/recipes-extended/pigz/pigz_2.3.3.bb
index cd5508d..080be2b 100644
--- a/meta/recipes-extended/pigz/pigz_2.3.1.bb
+++ b/meta/recipes-extended/pigz/pigz_2.3.3.bb
@@ -1,8 +1,10 @@
require pigz.inc
LIC_FILES_CHKSUM =
"file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95"
-SRC_URI[md5sum] = "e803f8bc0770c7a5e96dccb1d2dd2aab"
-SRC_URI[sha256sum] =
"629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54"
+SRC_URI += "file://link-order.patch"
+
+SRC_URI[md5sum] = "01d7a16cce77929cc1a78aa1bdfb68cb"
+SRC_URI[sha256sum] =
"4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c"
NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
--
2.1.1
--
___
Openembedded-core mailing list
Openembedd
Re: [OE-core] [PATCH 0/2] kmod new packageconfig and dbus split package
On 28 January 2015 at 15:47, Bottazzini, Bruno wrote: > Guys, were you able to look at this patch ? > Yep, it's queued. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] kmod new packageconfig and dbus split package
On Wed, 21 Jan 2015 18:00:56 -0200 Bruno Bottazzini wrote: Guys, were you able to look at this patch ? > In this patchset we include two changes: > > 1- kmod: new PACKAGECONFIG debug and logging to help reduce binary > size. 2- dbus: split it into two package. We will be able to choose > if we want the full version or a smaller one. > > Gustavo Sverzut Barbieri (2): > kmod: new PACKAGECONFIG debug and logging to help reduce binary > size. dbus: split tools package. > > meta/recipes-core/dbus/dbus.inc | 13 +++-- > meta/recipes-kernel/kmod/kmod.inc | 5 - > 2 files changed, 11 insertions(+), 7 deletions(-) > > -- > 1.9.1 > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 0/4] REQUIRED_DISTRO_FEATURES
Changes since v3: xf86-* resolved xorg-driver-common.inc piglit moved to separate commit which maybe won't be merged if piglit if fixed sooner more recipes were updated, in the end I could delete 116 entries from my blacklist The following changes since commit 2a775ebbb175dd70fc7228607c306d4ccb9e4ba4: net-tools: Fix rerunning of do_patch task (2015-01-23 14:32:40 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib jansa/distro http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/distro Martin Jansa (4): recipes: add x11 to required DISTRO_FEATURES xorg-driver: add x11 to required DISTRO_FEATURES recipes-qt: add x11 to required DISTRO_FEATURES piglit: add x11 to required DISTRO_FEATURES meta/classes/qt4x11.bbclass | 5 - meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 4 +++- meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb | 4 meta/recipes-graphics/fstests/fstests_git.bb | 4 +++- meta/recipes-graphics/glew/glew_1.11.0.bb| 4 +++- meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb| 4 +++- .../recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb | 4 +++- meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb | 4 +++- meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb | 4 +++- meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb| 4 +++- meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb | 4 +++- meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb | 4 +++- meta/recipes-graphics/piglit/piglit_git.bb | 4 +++- meta/recipes-graphics/pong-clock/pong-clock_1.0.bb | 4 .../startup-notification/startup-notification_0.12.bb| 4 +++- meta/recipes-graphics/x11-common/x11-common_0.1.bb | 4 meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb| 4 +++- meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | 4 +++- meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 4 +++- meta/recipes-graphics/xrestop/xrestop_0.4.bb | 4 +++- meta/recipes-graphics/xtscal/xtscal_0.6.3.bb | 4 +++- meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb| 4 meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb| 4 +++- meta/recipes-support/atk/at-spi2-core_2.14.1.bb | 4 +++- meta/recipes-support/consolekit/consolekit_0.4.6.bb | 4 +++- 25 files changed, 80 insertions(+), 21 deletions(-) -- 2.2.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 1/4] recipes: add x11 to required DISTRO_FEATURES
* it's not complete, but recipes depending on virtual/libx11 are easiest
to spot, I've long list of PNBLACKLIST for all recipes which cannot
be built in distro without x11 in DISTRO_FEATURES
Signed-off-by: Martin Jansa
---
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 4 +++-
meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb | 4
meta/recipes-graphics/fstests/fstests_git.bb | 4 +++-
meta/recipes-graphics/glew/glew_1.11.0.bb | 4 +++-
meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb | 4 +++-
meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb | 4 +++-
meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb | 4 +++-
meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb | 4 +++-
meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb | 4 +++-
meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb | 4 +++-
meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb | 4 +++-
meta/recipes-graphics/pong-clock/pong-clock_1.0.bb| 4
.../startup-notification/startup-notification_0.12.bb | 4 +++-
meta/recipes-graphics/x11-common/x11-common_0.1.bb| 4
meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 4 +++-
meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | 4 +++-
meta/recipes-graphics/xrestop/xrestop_0.4.bb | 4 +++-
meta/recipes-graphics/xtscal/xtscal_0.6.3.bb | 4 +++-
meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 4 +++-
meta/recipes-support/atk/at-spi2-core_2.14.1.bb | 4 +++-
meta/recipes-support/consolekit/consolekit_0.4.6.bb | 4 +++-
21 files changed, 66 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index af57fac..01a8b43 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -7,7 +7,9 @@ DESCRIPTION = "Packages required to run the build system"
PR = "r13"
LICENSE = "MIT"
-inherit packagegroup
+inherit packagegroup distro_features_check
+# rdepends on libx11-dev
+REQUIRED_DISTRO_FEATURES = "x11"
PACKAGES = "\
packagegroup-self-hosted \
diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
index 18fc893..3427fdf 100644
--- a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
+++ b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb
@@ -5,4 +5,8 @@ include eglinfo.inc
DEPENDS += "virtual/libx11"
+inherit distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
SUMMARY += "(X11 version)"
diff --git a/meta/recipes-graphics/fstests/fstests_git.bb
b/meta/recipes-graphics/fstests/fstests_git.bb
index 57ff9f6..95c33f4 100644
--- a/meta/recipes-graphics/fstests/fstests_git.bb
+++ b/meta/recipes-graphics/fstests/fstests_git.bb
@@ -13,4 +13,6 @@ LIC_FILES_CHKSUM =
"file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac
S = "${WORKDIR}/git/tests"
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta/recipes-graphics/glew/glew_1.11.0.bb
b/meta/recipes-graphics/glew/glew_1.11.0.bb
index 4231320..7eb3532 100644
--- a/meta/recipes-graphics/glew/glew_1.11.0.bb
+++ b/meta/recipes-graphics/glew/glew_1.11.0.bb
@@ -18,4 +18,6 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
SRC_URI[md5sum] = "f6d72c7426a5f66580ad09e50816450a"
SRC_URI[sha256sum] =
"69bbce306ac281c4fa806a7a7d02c0596281a2d8f9d70690e98126f23ba513d6"
-inherit autotools lib_package pkgconfig
+inherit autotools lib_package pkgconfig distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
index 4acac39..f2eb675 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
@@ -16,7 +16,9 @@ SRC_URI =
"http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BP
SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7"
SRC_URI[sha256sum] =
"254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53"
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
PACKAGECONFIG ??= "jpeg png xft xsettings"
PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
diff --git
a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
b/meta/recip
[OE-core] [PATCHv4 3/4] recipes-qt: add x11 to required DISTRO_FEATURES
* it's not complete, but recipes depending on virtual/libx11 are easiest
to spot, I've long list of PNBLACKLIST for all recipes which cannot
be built in distro without x11 in DISTRO_FEATURES
Signed-off-by: Martin Jansa
---
meta/classes/qt4x11.bbclass | 5 -
meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb | 4
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass
index b06e15d..6f06d34 100644
--- a/meta/classes/qt4x11.bbclass
+++ b/meta/classes/qt4x11.bbclass
@@ -1,7 +1,10 @@
QT4DEPENDS ?= "qt4-x11 "
DEPENDS_prepend = "${QT4DEPENDS}"
-inherit qmake2
+# depends on qt4-x11
+REQUIRED_DISTRO_FEATURES += "x11"
+
+inherit qmake2 distro_features_check
QT_BASE_NAME = "qt4"
QT_DIR_NAME = "qt4"
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
index 0e7c800..772c151 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
@@ -4,6 +4,10 @@ QTLIBPREFIX = ""
require packagegroup-qt-toolchain-target.inc
+inherit distro_features_check
+# depends on qt4-x11-free
+REQUIRED_DISTRO_FEATURES = "x11"
+
RDEPENDS_${PN} += " \
qt4-x11-free-dev \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev',
'', d)} \
--
2.2.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 4/4] piglit: add x11 to required DISTRO_FEATURES
* there is some pending work to resolve this unnecessary x11
dependency, this can be reverted together with x11 dependency
removal
Signed-off-by: Martin Jansa
---
meta/recipes-graphics/piglit/piglit_git.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
b/meta/recipes-graphics/piglit/piglit_git.bb
index f468120..68ac7e7 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -13,7 +13,9 @@ S = "${WORKDIR}/git"
DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu
python-mako-native python-numpy-native"
-inherit cmake pythonnative
+inherit cmake pythonnative distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
# As piglit doesn't install, enforce in-tree builds so that we can easily copy
# contents out of $S and $B.
--
2.2.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 2/4] xorg-driver: add x11 to required DISTRO_FEATURES
Signed-off-by: Martin Jansa
---
meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 17fac8b..7a710dc 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -16,7 +16,9 @@ S = "${WORKDIR}/${BPN}-${PV}"
FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
-inherit autotools pkgconfig
+inherit autotools pkgconfig distro_features_check
+# depends on virtual/xserver
+REQUIRED_DISTRO_FEATURES = "x11"
# FIXME: We don't want to include the libtool archives (*.la) from modules
# directory, as they serve no useful purpose. Upstream should fix Makefile.am
--
2.2.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Richard Tollerton : font-util: Fix incorrect PKG_CONFIG_PATH
On Thu, Jan 08, 2015 at 01:01:55PM +0100, Martin Jansa wrote:
> On Wed, Jan 07, 2015 at 03:12:56PM +0100, Martin Jansa wrote:
> > On Fri, Dec 19, 2014 at 06:08:41PM +, g...@git.openembedded.org wrote:
> > > Module: openembedded-core.git
> > > Branch: master
> > > Commit: 89a29a3ad0742cd713e739d3d460be7711966679
> > > URL:
> > > http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=89a29a3ad0742cd713e739d3d460be7711966679
> > >
> > > Author: Richard Tollerton
> > > Date: Fri Dec 12 13:34:00 2014 -0600
> > >
> > > font-util: Fix incorrect PKG_CONFIG_PATH
> > >
> > > PKG_CONFIG_PATH always defaults to /usr/lib/pkgconfig, and the host
> > > /usr/lib/pkgconfig is always checked as a fallback; however,
> > > PKG_CONFIG_PATH is currently (incorrectly) set to /usr/lib/pkg-config in
> > > the sysroot, which doesn't exist. On host distros where the font
> >
> >
> > > encoding maps are stored under a different path than OE, this will break
> > > font builds, because ucs2any will attempt to read the sysroot's encoding
> > > maps with the host paths.
> >
> > ^ Is this description of what the patch is supposed to fix or expected
> > side-effect of this change?
> >
> > Because all font recipes and meta-oe are failing since this change with
> > errors like this:
> >
> > /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/ucs2any:
> > Can't read mapping file
> > '/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/share/fonts/X11/util/map-ISO8859-1':
> > No such file or directory!
> >
> > See http://www.openembedded.org/wiki/Bitbake_World_Status
>
> I can confirm that reverting this patch fixes font-* recipes
> http://lists.openembedded.org/pipermail/openembedded-core/2015-January/100523.html
Ping
> > > Signed-off-by: Richard Tollerton
> > > Signed-off-by: Ross Burton
> > >
> > > ---
> > >
> > > meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
> > > b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
> > > index 8b42991..cc4258a 100644
> > > --- a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
> > > +++ b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
> > > @@ -17,7 +17,7 @@ RDEPENDS_${PN}_class-native = "mkfontdir-native
> > > mkfontscale-native"
> > > PR = "${INC_PR}.0"
> > >
> > > do_configure_prepend() {
> > > -sed -i
> > > "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\"
> > > pkg-config#g" ${S}/fontutil.m4.in
> > > +sed -i
> > > "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkgconfig\"
> > > pkg-config#g" ${S}/fontutil.m4.in
> > > }
> > >
> > > BBCLASSEXTEND = "native"
> > >
> > > --
> > > ___
> > > Openembedded-commits mailing list
> > > openembedded-comm...@lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-commits
> >
> > --
> > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
>
>
>
> --
> Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] security_flags: disable PIE on expect
On 28 January 2015 at 12:47, Martin Jansa wrote: > And flac doesn't need it anymore? > Whoops, thanks! Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] security_flags: disable PIE on expect
On Wed, Jan 28, 2015 at 12:41:07PM +, Ross Burton wrote:
> Disable PIE in expect as otherwise it tries to link the shared library as an
> executable.
And flac doesn't need it anymore?
> Signed-off-by: Ross Burton
> ---
> meta/conf/distro/include/security_flags.inc |2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/conf/distro/include/security_flags.inc
> b/meta/conf/distro/include/security_flags.inc
> index f996184..033638c 100644
> --- a/meta/conf/distro/include/security_flags.inc
> +++ b/meta/conf/distro/include/security_flags.inc
> @@ -27,7 +27,7 @@ SECURITY_CFLAGS_pn-directfb = "${SECURITY_NO_PIE_CFLAGS}"
> SECURITY_CFLAGS_pn-glibc = ""
> SECURITY_CFLAGS_pn-glibc-initial = ""
> SECURITY_CFLAGS_pn-enchant = "${SECURITY_NO_PIE_CFLAGS}"
> -SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}"
> +SECURITY_CFLAGS_pn-expect = "${SECURITY_NO_PIE_CFLAGS}"
> SECURITY_CFLAGS_pn-gcc-runtime = "${SECURITY_NO_PIE_CFLAGS}"
> SECURITY_CFLAGS_pn-gcc-sanitizers = "${SECURITY_NO_PIE_CFLAGS}"
> SECURITY_CFLAGS_pn-gdb = "${SECURITY_NO_PIE_CFLAGS}"
> --
> 1.7.10.4
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] security_flags: disable PIE on expect
Disable PIE in expect as otherwise it tries to link the shared library as an
executable.
Signed-off-by: Ross Burton
---
meta/conf/distro/include/security_flags.inc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/distro/include/security_flags.inc
b/meta/conf/distro/include/security_flags.inc
index f996184..033638c 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -27,7 +27,7 @@ SECURITY_CFLAGS_pn-directfb = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-glibc = ""
SECURITY_CFLAGS_pn-glibc-initial = ""
SECURITY_CFLAGS_pn-enchant = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-expect = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-gcc-runtime = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-gcc-sanitizers = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS_pn-gdb = "${SECURITY_NO_PIE_CFLAGS}"
--
1.7.10.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Minor recipetool fix
The following changes since commit 2a775ebbb175dd70fc7228607c306d4ccb9e4ba4: net-tools: Fix rerunning of do_patch task (2015-01-23 14:32:40 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/recipetool-fix http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/recipetool-fix Paul Eggleton (1): recipetool: replace version in S value scripts/lib/recipetool/create.py | 2 ++ 1 file changed, 2 insertions(+) -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] recipetool: replace version in S value
If a versioned recipe filename is specified, replace the version in the
value of S with ${PV} just as we do with SRC_URI to make future upgrades
of the recipe easier.
Signed-off-by: Paul Eggleton
---
scripts/lib/recipetool/create.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 6dba078..38f5ead 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -212,6 +212,8 @@ def create_recipe(args):
# This would be the default, so we don't need to set S in the
recipe
srcsubdir = ''
if srcsubdir:
+if pv and pv not in 'git svn hg'.split():
+srcsubdir = srcsubdir.replace(pv, '${PV}')
lines_before.append('S = "${WORKDIR}/%s"' % srcsubdir)
lines_before.append('')
--
1.9.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] classes/image: drop unused default of MACHINE_POSTPROCESS_COMMAND
In the daisy (1.6) timeframe, when we rewrote the image construction in
Python, we neglected to reimplement the support for the little used and
undocumented variable MACHINE_POSTPROCESS_COMMAND, and apparently nobody
noticed. We have a better method for implementing machine-specific image
formats that is in wider use (i.e. add a custom class which implements
the new image type, add the class to IMAGE_CLASSES and the type to
IMAGE_FSTYPES), and we now also have wic. Thus it makes more sense to
just call this variable unsupported now and drop the sole remaining
reference to it.
Signed-off-by: Paul Eggleton
---
meta/classes/image.bbclass | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 22b6970..6bd3e03 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -156,7 +156,6 @@ IMAGE_CLASSES += "image_types"
inherit ${IMAGE_CLASSES}
IMAGE_POSTPROCESS_COMMAND ?= ""
-MACHINE_POSTPROCESS_COMMAND ?= ""
# Allow dropbear/openssh to accept logins from accounts with an empty password
string if debug-tweaks is enabled
ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES",
"debug-tweaks", "ssh_allow_empty_password; ", "",d)}'
# Enable postinst logging if debug-tweaks is enabled
--
1.9.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] lib/oe/rootfs.py: rename _uninstall_uneeded to fix spelling error
Rename it to _uninstall_unneeded.
Signed-off-by: Paul Eggleton
---
meta/lib/oe/rootfs.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 72d32f7..536efcc 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -118,7 +118,7 @@ class Rootfs(object):
if self.d.getVar('USE_DEVFS', True) != "1":
self._create_devfs()
-self._uninstall_uneeded()
+self._uninstall_unneeded()
self._insert_feed_uris()
@@ -128,7 +128,7 @@ class Rootfs(object):
self._cleanup()
-def _uninstall_uneeded(self):
+def _uninstall_unneeded(self):
# Remove unneeded init script symlinks
delayed_postinsts = self._get_delayed_postinsts()
if delayed_postinsts is None:
--
1.9.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] lib/oe/image.py: add error checking for missing IMAGE_CMD
An invalid value in IMAGE_FSTYPES was triggering a traceback. Add a
check and a reasonable error message instead.
Signed-off-by: Paul Eggleton
---
meta/lib/oe/image.py | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index f9c8f84..0ce303d 100644
--- a/meta/lib/oe/image.py
+++ b/meta/lib/oe/image.py
@@ -296,7 +296,11 @@ class Image(ImageDepGraph):
bb.data.update_data(localdata)
localdata.setVar('type', type)
-cmds.append("\t" + localdata.getVar("IMAGE_CMD", True))
+image_cmd = localdata.getVar("IMAGE_CMD", True)
+if image_cmd:
+cmds.append("\t" + image_cmd)
+else:
+bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry
'%s' - possibly invalid type name or missing support class" % type)
cmds.append(localdata.expand("\tcd ${DEPLOY_DIR_IMAGE}"))
if type in cimages:
--
1.9.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] classes/image: skip recipe on invalid IMAGE_FEATURES item
If you add an item to EXTRA_IMAGE_FEATURES in your local.conf that is
not supported by image.bbclass itself (such as "tools-sdk" which is
implemented in core-image.bbclass), it can be somewhat annoying to have
the parse fall over if you have a recipe that inherits image.bbclass
only. Change the error from bb.fatal to skip the recipe instead so that
you only see the error when attempting to build the recipe, plus add a
bit of logic to report if the feature is coming in via
EXTRA_IMAGE_FEATURES.
Fixes [YOCTO #5023].
Signed-off-by: Paul Eggleton
---
meta/classes/image.bbclass | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 6bd3e03..62b214a 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -52,7 +52,10 @@ def check_image_features(d):
features = set(oe.data.typed_value('IMAGE_FEATURES', d))
for feature in features:
if feature not in valid_features:
-bb.fatal("'%s' in IMAGE_FEATURES is not a valid image feature.
Valid features: %s" % (feature, ' '.join(valid_features)))
+if bb.utils.contains('EXTRA_IMAGE_FEATURES', feature, True, False,
d):
+raise bb.parse.SkipRecipe("'%s' in IMAGE_FEATURES (added via
EXTRA_IMAGE_FEATURES) is not a valid image feature. Valid features: %s" %
(feature, ' '.join(valid_features)))
+else:
+raise bb.parse.SkipRecipe("'%s' in IMAGE_FEATURES is not a
valid image feature. Valid features: %s" % (feature, ' '.join(valid_features)))
IMAGE_INSTALL ?= ""
IMAGE_INSTALL[type] = "list"
--
1.9.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] classes/image: ensure uninstalled packages do not appear in manifests
Since the rewrite of the image construction code in python a few
releases ago, we remove a couple of packages from the image as one of
the final steps when constructing the image (notably update-rc.d and
run-postinsts). However, because of the order of operations, these
packages are still listed both in the buildhistory
installed_package*.txt files and in the manifest file created next to
the image, which is wrong.
There were two possible solutions to this: (1) change the order such
that the uninstallation occurs before calling ROOTFS_POSTPROCESS_COMMAND
or (2) add another hook variable in such that we can have the
package list collection code run at the right time. Because it's
currently possible (but very much not recommended) to install additional
packages within ROOTFS_POSTPROCESS_COMMAND, which may have postinstall
scripts and thus require the packages we would otherwise uninstall if we
were to take option 1, option 2 is really the least likely to cause
problems. Therefore, add ROOTFS_POSTUNINSTALL_COMMAND and make the image
and buildhistory classes use it.
Fixes [YOCTO #6479].
Signed-off-by: Paul Eggleton
---
meta/classes/buildhistory.bbclass | 5 ++--
meta/classes/image.bbclass| 2 +-
meta/lib/oe/rootfs.py | 55 +--
3 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/meta/classes/buildhistory.bbclass
b/meta/classes/buildhistory.bbclass
index 2b5f84a..90cfe4f 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -484,8 +484,9 @@ END
echo "SDKSIZE = $sdksize" >> ${BUILDHISTORY_DIR_SDK}/sdk-info.txt
}
-# By prepending we get in before the removal of packaging files
-ROOTFS_POSTPROCESS_COMMAND =+ " buildhistory_list_installed_image ;\
+# By using ROOTFS_POSTUNINSTALL_COMMAND we get in after uninstallation of
+# unneeded packages but before the removal of packaging files
+ROOTFS_POSTUNINSTALL_COMMAND += " buildhistory_list_installed_image ;\
buildhistory_get_image_installed ; "
IMAGE_POSTPROCESS_COMMAND += " buildhistory_get_imageinfo ; "
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 62b214a..56dbf52 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -165,7 +165,7 @@ ROOTFS_POSTPROCESS_COMMAND +=
'${@bb.utils.contains("IMAGE_FEATURES", "debug-twe
ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES",
"debug-tweaks", "postinst_enable_logging; ", "",d)}'
# Write manifest
IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest"
-ROOTFS_POSTPROCESS_COMMAND =+ "write_image_manifest ; "
+ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; "
# Set default postinst log file
POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log"
# Set default target for systemd images
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 536efcc..30d164c 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -137,34 +137,39 @@ class Rootfs(object):
self.d.getVar('IMAGE_ROOTFS', True),
"run-postinsts", "remove"])
-# Remove unneeded package-management related components
-if bb.utils.contains("IMAGE_FEATURES", "package-management",
- True, False, self.d):
-return
+runtime_pkgmanage = bb.utils.contains("IMAGE_FEATURES",
"package-management",
+ True, False, self.d)
+if not runtime_pkgmanage:
+# Remove components that we don't need if we're not going to
install
+# additional packages at runtime
+if delayed_postinsts is None:
+installed_pkgs_dir =
self.d.expand('${WORKDIR}/installed_pkgs.txt')
+pkgs_to_remove = list()
+with open(installed_pkgs_dir, "r+") as installed_pkgs:
+pkgs_installed = installed_pkgs.read().split('\n')
+for pkg_installed in pkgs_installed[:]:
+pkg = pkg_installed.split()[0]
+if pkg in ["update-rc.d",
+"base-passwd",
+self.d.getVar("ROOTFS_BOOTSTRAP_INSTALL", True)
+]:
+pkgs_to_remove.append(pkg)
+pkgs_installed.remove(pkg_installed)
+
+if len(pkgs_to_remove) > 0:
+self.pm.remove(pkgs_to_remove, False)
+# Update installed_pkgs.txt
+open(installed_pkgs_dir,
"w+").write('\n'.join(pkgs_installed))
-if delayed_postinsts is None:
-installed_pkgs_dir = self.d.expand('${WORKDIR}/installed_pkgs.txt')
-pkgs_to_remove = list()
-with open(installed_pkgs_dir, "r+") as installed_pkgs:
-pkgs_installed = installed_pkgs.read().spli
[OE-core] [PATCH 0/5] Fixes for image construction
The following changes since commit 2a775ebbb175dd70fc7228607c306d4ccb9e4ba4: net-tools: Fix rerunning of do_patch task (2015-01-23 14:32:40 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/imagefixes http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/imagefixes Paul Eggleton (5): classes/image: drop unused default of MACHINE_POSTPROCESS_COMMAND lib/oe/rootfs.py: rename _uninstall_uneeded to fix spelling error classes/image: skip recipe on invalid IMAGE_FEATURES item classes/image: ensure uninstalled packages do not appear in manifests lib/oe/image.py: add error checking for missing IMAGE_CMD meta/classes/buildhistory.bbclass | 5 ++-- meta/classes/image.bbclass| 8 -- meta/lib/oe/image.py | 6 +++- meta/lib/oe/rootfs.py | 59 +-- 4 files changed, 45 insertions(+), 33 deletions(-) -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qt4-x11-free: Fix Qt4 to build without opengl
On Wednesday 28 January 2015 11:13:44 Fabien Proriol wrote:
> If we don't have opengl support on target, qt4 still depends to libgl, but
> Qt4 don't need it...
>
> Signed-off-by: Fabien Proriol
> ---
> meta/recipes-qt/qt4/qt4-x11-free.inc | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc
> b/meta/recipes-qt/qt4/qt4-x11-free.inc index 3b1e0fe..ae3e1ca 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -4,7 +4,8 @@ SUMMARY = "Cross-platform UI toolkit and application
> framework (X11 version)" DESCRIPTION = "Qt is a versatile cross-platform
> application framework -- this is the X11 version." HOMEPAGE =
> "http://qt-project.org/";
> SECTION = "x11/libs"
> -DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext
> libxrender libxrandr libxcursor"
> +DEPENDS += "virtual/libx11 fontconfig
> libxft libxext libxrender libxrandr libxcursor"
> +DEPENDS += "${@bb.utils.contains('QT_CONFIG_FLAGS', '-opengl',
> 'virtual/libgl', '', d)} "
> PROVIDES += "qt4-x11"
> QT4DEPENDS = ""
Acked-by: Paul Eggleton
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qt4-x11-free: Fix Qt4 to build without opengl
If we don't have opengl support on target, qt4 still depends to libgl, but Qt4
don't need it...
Signed-off-by: Fabien Proriol
---
meta/recipes-qt/qt4/qt4-x11-free.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc
b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 3b1e0fe..ae3e1ca 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -4,7 +4,8 @@ SUMMARY = "Cross-platform UI toolkit and application framework
(X11 version)"
DESCRIPTION = "Qt is a versatile cross-platform application framework -- this
is the X11 version."
HOMEPAGE = "http://qt-project.org/";
SECTION = "x11/libs"
-DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender
libxrandr libxcursor"
+DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr
libxcursor"
+DEPENDS += "${@bb.utils.contains('QT_CONFIG_FLAGS', '-opengl',
'virtual/libgl', '', d)} "
PROVIDES += "qt4-x11"
QT4DEPENDS = ""
--
2.0.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH] mesa: Upgrade to 10.4.0
Ignore this, I got some feedback from Robert, will send V2.
Pengyu
On 01/28/2015 03:15 PM, Pengyu Ma wrote:
Signed-off-by: Pengyu Ma
---
meta/recipes-graphics/mesa/mesa_10.4.0.bb | 16
1 file changed, 16 insertions(+)
create mode 100644 meta/recipes-graphics/mesa/mesa_10.4.0.bb
diff --git a/meta/recipes-graphics/mesa/mesa_10.4.0.bb
b/meta/recipes-graphics/mesa/mesa_10.4.0.bb
new file mode 100644
index 000..7d3723e
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa_10.4.0.bb
@@ -0,0 +1,16 @@
+require ${BPN}.inc
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2";
+
+SRC_URI[md5sum] = "b7b37117eecbdfaaf3075acfb063d5a3"
+SRC_URI[sha256sum] =
"98a7dff3a1a6708c79789de8b9a05d8042e867067f70e8f30387c15026233219"
+
+S = "${WORKDIR}/Mesa-${PV}"
+
+#because we cannot rely on the fact that all apps will use pkgconfig,
+#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
+do_install_append() {
+if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
+sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if
${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/'
${D}${includedir}/EGL/eglplatform.h
+fi
+}
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][V2][PATCH] mesa: Upgrade to 10.4.0
Signed-off-by: Pengyu Ma
---
.../mesa/{mesa-gl_10.3.4.bb => mesa-gl_10.4.0.bb} |0
.../mesa/{mesa_10.3.4.bb => mesa_10.4.0.bb}|4 ++--
meta/recipes-graphics/mesa/mesa_git.bb |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-gl_10.3.4.bb => mesa-gl_10.4.0.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_10.3.4.bb => mesa_10.4.0.bb} (78%)
diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb
b/meta/recipes-graphics/mesa/mesa-gl_10.4.0.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_10.3.4.bb
rename to meta/recipes-graphics/mesa/mesa-gl_10.4.0.bb
diff --git a/meta/recipes-graphics/mesa/mesa_10.3.4.bb
b/meta/recipes-graphics/mesa/mesa_10.4.0.bb
similarity index 78%
rename from meta/recipes-graphics/mesa/mesa_10.3.4.bb
rename to meta/recipes-graphics/mesa/mesa_10.4.0.bb
index 50092c9..7d3723e 100644
--- a/meta/recipes-graphics/mesa/mesa_10.3.4.bb
+++ b/meta/recipes-graphics/mesa/mesa_10.4.0.bb
@@ -2,8 +2,8 @@ require ${BPN}.inc
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2";
-SRC_URI[md5sum] = "fa0558a3d02c2bb8c208c030ccdc992e"
-SRC_URI[sha256sum] =
"e6373913142338d10515daf619d659433bfd2989988198930c13b0945a15e98a"
+SRC_URI[md5sum] = "b7b37117eecbdfaaf3075acfb063d5a3"
+SRC_URI[sha256sum] =
"98a7dff3a1a6708c79789de8b9a05d8042e867067f70e8f30387c15026233219"
S = "${WORKDIR}/Mesa-${PV}"
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb
b/meta/recipes-graphics/mesa/mesa_git.bb
index b046ae2..e554ff4 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -4,8 +4,8 @@ DEFAULT_PREFERENCE = "-1"
LIC_FILES_CHKSUM =
"file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de"
-SRCREV = "c7b9a2e38a3e471562b50dab8be65db8ac6819f8"
-PV = "10.3.4+git${SRCPV}"
+SRCREV = "f70e4d4afd16e66506ce3b055edb3b71b1464890"
+PV = "10.4.3+git${SRCPV}"
SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.4"
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
