Re: [OE-core] [PATCH] devtool: deploy-target: Support stripped libs and execs

[Tobias Hagelborn]

On 06/14/2017 01:35 PM, Tobias Hagelborn wrote:

On 06/14/2017 11:28 AM, Richard Purdie wrote:

On Wed, 2017-06-14 at 08:24 +0200, Tobias Hagelborn wrote:

New devtool deploy-target option --strip which enables deploying
stripped binaries, saving some space on target.

* Copies the files of ${D} into a new directory and strips them in
place
* Based on sysroot_strip from staging.bbclass
* Added devtool.conf option "strip" for changing default behavior
* Added .ko strip support compared to original function sysroot_strip


This looks very like the original strip function. Would it be possible
to create one generic strip function in lib/oe which we could call from
the various places rather than duplicating this again?

(I think staging.bbclass and lib/oe/package.py:runstrip() are already
similar code).

Cheers,

Richard


I did think if this but I felt these are quite central functions and I
didn't have enough tests locally to cover for those classes (staging /
package)

I can supply another version of this patch where the strip function is
merged into lib/oe.

//Tobias


It should be fairly straightforward to do for staging.bbclass.
I also looked into package.bbclass which has a similar one 
(split_and_strip_files) but that one is very convoluted with the package 
splitting so I want to leave that one for now.

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for fuse: fix SRC_URI

[Patchwork]

== Series Details ==

Series: fuse: fix SRC_URI
Revision: 1
URL   : https://patchwork.openembedded.org/series/7282/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 059846662f)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [meta-filesystems][PATCH] fuse: fix SRC_URI

[Robert Yang]

Sorry, wrong list, please ignore it.

// Robert

On 06/16/2017 11:02 AM, Robert Yang wrote:

${P} -> ${BP}, otherwise it would fail when multilib.

Signed-off-by: Robert Yang 
---
 meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb 
b/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb
index e66f3cd..87292fe 100644
--- a/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb
+++ b/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb
@@ -10,7 +10,7 @@ LICENSE = "GPLv2 & LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"

-SRC_URI = 
"https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz \
+SRC_URI = 
"https://github.com/libfuse/libfuse/releases/download/${BP}/${BP}.tar.gz \
file://gold-unversioned-symbol.patch \
file://aarch64.patch \
file://0001-fuse-fix-the-return-value-of-help-option.patch \


--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [meta-filesystems][PATCH] fuse: fix SRC_URI

[Robert Yang]

${P} -> ${BP}, otherwise it would fail when multilib.

Signed-off-by: Robert Yang 
---
 meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb 
b/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb
index e66f3cd..87292fe 100644
--- a/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb
+++ b/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb
@@ -10,7 +10,7 @@ LICENSE = "GPLv2 & LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = 
"https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz \
+SRC_URI = 
"https://github.com/libfuse/libfuse/releases/download/${BP}/${BP}.tar.gz \
file://gold-unversioned-symbol.patch \
file://aarch64.patch \
file://0001-fuse-fix-the-return-value-of-help-option.patch \
-- 
2.10.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 3/3] package_ipk: Parallelise ipk creation

[Khem Raj]

On Wed, Jun 14, 2017 at 6:42 AM, Richard Purdie
 wrote:
> Allow the creation of ipks to happen in parallel, making best use of resources
> on multiprocessor systems.
>
> Signed-off-by: Richard Purdie 
> ---
>  meta/classes/package_ipk.bbclass | 19 +--
>  1 file changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/package_ipk.bbclass 
> b/meta/classes/package_ipk.bbclass
> index d2ce3b3..282d212 100644
> --- a/meta/classes/package_ipk.bbclass
> +++ b/meta/classes/package_ipk.bbclass
> @@ -17,6 +17,8 @@ OPKG_ARGS += "${@['', '--add-exclude ' + ' --add-exclude 
> '.join((d.getVar('PACKA
>  OPKGLIBDIR = "${localstatedir}/lib"
>
>  python do_package_ipk () {
> +from multiprocessing import Process
> +
>  oldcwd = os.getcwd()
>
>  workdir = d.getVar('WORKDIR')
> @@ -37,11 +39,24 @@ python do_package_ipk () {
>  if os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"), 
> os.R_OK):
>  os.unlink(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"))
>
> -for pkg in packages.split():
> -ipk_write_pkg(pkg, d)
> +max_process = int(d.getVar("BB_NUMBER_THREADS") or os.cpu_count() or 1)
> +launched = []
> +pkgs = packages.split()
> +while pkgs:
> +if len(launched) < max_process:
> +p = Process(target=ipk_write_pkg, args=(pkgs.pop(), d))
> +p.start()
> +launched.append(p)
> +for q in launched:
> +# The finished processes are joined when calling is_alive()
> +if not q.is_alive():
> +launched.remove(q)
> +for p in launched:
> +p.join()
>
>  os.chdir(oldcwd)
>  }
> +do_package_ipk[vardepsexclude] = "BB_NUMBER_THREADS"
>
>  def ipk_write_pkg(pkg, d):
>  import re, copy

on a 44 core system, this patch bails out like below. Once I revert
this it works all fine.

ERROR: westeros-wpe-image-1.0-r0 do_rootfs: Unable to install
packages. Command
'/mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-musleabi/westeros-wpe-image/1.0-r0/recipe-sysroot-native/usr/bin/opkg
--volatile-cache -f /mnt/a/oe/build/tmp
/work/raspberrypi3-bec-linux-musleabi/westeros-wpe-image/1.0-r0/opkg.conf
-t 
/mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-musleabi/westeros-wpe-image/1.0-r0/temp/ipktemp/
-o /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-musleabi/west
eros-wpe-image/1.0-r0/rootfs  --force_postinstall
--prefer-arch-to-version   install 96boards-tools kernel-modules opkg
packagegroup-core-boot packagegroup-core-ssh-openssh
packagegroup-ml-wpe packagegroup-westeros psplash-raspberrypi run
-postinsts runit runit-serialgetty' returned 255:
Collected errors:
 * opkg_prepare_url_for_install: Couldn't find anything to satisfy
'96boards-tools'.
 * rm_r: Failed to open dir
/mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-musleabi/westeros-wpe-image/1.0-r0/temp/ipktemp//opkg-J9PI7V:
No such file or directory.

ERROR: westeros-wpe-image-1.0-r0 do_rootfs: Function failed: do_rootfs
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/2] ncurses: add SYSROOT_DESTDIR for siteconfig_gencache

[Huang, Jie (Jackie)]

> 
> 
> From: Burton, Ross [mailto:ross.bur...@intel.com] 
> Sent: Thursday, June 15, 2017 20:31
> To: Huang, Jie (Jackie)
> Cc: OE-core
> Subject: Re: [OE-core] [PATCH 1/2] ncurses: add SYSROOT_DESTDIR for 
> siteconfig_gencache
> 
> 
> On 31 May 2017 at 09:27,  wrote:
> +EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'"
> 
> Why is this ncurses specific, it sounds like something which will impact all 
> users of siteconfig?

My original issue is not ncurses specific, that is:
After switching to RSS, the siteconfig cache files in ACLOCALDIR setup by 
autotools.bbclass was dropped, so searching
the path ACLOCALDIR for siteconfig files ended up with nothing, which caused 
some package (like openhpi) fail to configure, 
so the "PATCH 2/2" change it back to search SITECONFIG_SYSROOTCACHE.

But I met the second issue after the that:
util-linux depends on ncurses but the siteinfo in ncurses_config which is 
populated to SITECONFIG_SYSROOTCACHE  is not correct:
ac_cv_header_curses_h=${ac_cv_header_curses_h=no}
ac_cv_header_ncurses_h=${ac_cv_header_ncurses_h=no}

then it fails to build (it should be the same issue for other package that 
depend on ncurses), so this patch is needed.
And the patch will only impact the packages that depend on ncurses, for those 
without dependency on ncurses, there 
is no ncurses_config at all in their own recipe-sysroot.

Thanks,
Jackie

> 
> Ross
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] libnewt: 0.52.19 -> 0.52.20

[Huang, Qiyu]

ping

> -Original Message-
> From: Huang, Qiyu/黄 琦宇
> Sent: Monday, May 15, 2017 11:20 AM
> To: openembedded-core@lists.openembedded.org
> Cc: Huang, Qiyu/黄 琦宇 
> Subject: [OE-core] [PATCH] libnewt: 0.52.19 -> 0.52.20
> 
> Upgrade libnewt from 0.52.19 to 0.52.20.
> 
> Signed-off-by: Huang Qiyu 
> ---
>  .../newt/{libnewt-python_0.52.19.bb => libnewt-python_0.52.20.bb} | 0
>  meta/recipes-extended/newt/{libnewt_0.52.19.bb => libnewt_0.52.20.bb} | 4
> ++--
>  2 files changed, 2 insertions(+), 2 deletions(-)  rename
> meta/recipes-extended/newt/{libnewt-python_0.52.19.bb =>
> libnewt-python_0.52.20.bb} (100%)  rename
> meta/recipes-extended/newt/{libnewt_0.52.19.bb => libnewt_0.52.20.bb}
> (90%)
> 
> diff --git a/meta/recipes-extended/newt/libnewt-python_0.52.19.bb
> b/meta/recipes-extended/newt/libnewt-python_0.52.20.bb
> similarity index 100%
> rename from meta/recipes-extended/newt/libnewt-python_0.52.19.bb
> rename to meta/recipes-extended/newt/libnewt-python_0.52.20.bb
> diff --git a/meta/recipes-extended/newt/libnewt_0.52.19.bb
> b/meta/recipes-extended/newt/libnewt_0.52.20.bb
> similarity index 90%
> rename from meta/recipes-extended/newt/libnewt_0.52.19.bb
> rename to meta/recipes-extended/newt/libnewt_0.52.20.bb
> index de76ce2..65ce70c 100644
> --- a/meta/recipes-extended/newt/libnewt_0.52.19.bb
> +++ b/meta/recipes-extended/newt/libnewt_0.52.20.bb
> @@ -25,8 +25,8 @@ SRC_URI =
> "https://releases.pagure.org/newt/newt-${PV}.tar.gz \
> file://0001-detect-gold-as-GNU-linker-too.patch \  "
> 
> -SRC_URI[md5sum] = "e4aa0f7943edd39c52481a87f68f412a"
> -SRC_URI[sha256sum] =
> "08c0db56c21996af6a7cbab99491b774c6c09cef91cd9b03903c84634bff2e80"
> +SRC_URI[md5sum] = "70b288f821234593a8e7920e435b259b"
> +SRC_URI[sha256sum] =
> "8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc"
> 
>  S = "${WORKDIR}/newt-${PV}"
> 
> --
> 2.7.4



-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] opkg: upgrade to v0.3.5

[Alejandro del Castillo]

Drop status-conffile.patch, present in 0.3.5.

Signed-off-by: Alejandro del Castillo 
---
 .../opkg/opkg/status-conffile.patch| 69 --
 .../opkg/{opkg_0.3.4.bb => opkg_0.3.5.bb}  |  5 +-
 2 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/status-conffile.patch
 rename meta/recipes-devtools/opkg/{opkg_0.3.4.bb => opkg_0.3.5.bb} (93%)

diff --git a/meta/recipes-devtools/opkg/opkg/status-conffile.patch 
b/meta/recipes-devtools/opkg/opkg/status-conffile.patch
deleted file mode 100644
index 6fc405b..000
--- a/meta/recipes-devtools/opkg/opkg/status-conffile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton 
-
-From 086d5083dfe0102368cb7c8ce89b0c06b64ca773 Mon Sep 17 00:00:00 2001
-From: Ross Burton 
-Date: Tue, 10 Jan 2017 15:24:59 +
-Subject: [PATCH 1/2] opkg_cmd: only look at conffile status if we're going to
- output it
-
-The loop to compare the recorded conffile hash with their hash on disk is
-outputted at level INFO but the loop was executed at level NOTICE and higher.
-
-This means that if a conffile had been deleted the status operation would
-produce error messages for output it isn't displaying.
-
-Signed-off-by: Ross Burton 

- libopkg/opkg_cmd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
-index ba57c6a..37416fd 100644
 a/libopkg/opkg_cmd.c
-+++ b/libopkg/opkg_cmd.c
-@@ -638,7 +638,7 @@ static int opkg_info_status_cmd(int argc, char **argv, int 
installed_only)
- 
- pkg_formatted_info(stdout, pkg);
- 
--if (opkg_config->verbosity >= NOTICE) {
-+if (opkg_config->verbosity >= INFO) {
- conffile_list_elt_t *iter;
- for (iter = nv_pair_list_first(>conffiles); iter;
-  iter = nv_pair_list_next(>conffiles, iter)) {
--- 
-2.8.1
-
-From 225e30e0f9fa7cfeaa3f89e2713e5147ab371def Mon Sep 17 00:00:00 2001
-From: Ross Burton 
-Date: Tue, 10 Jan 2017 15:28:47 +
-Subject: [PATCH 2/2] conffile: gracefully handle deleted conffiles in
- conffile_has_been_modified
-
-Handle conffiles that don't exist gracefully so that instead of showing an 
error
-message from file_md5sum_alloc() a notice that the file has been deleted is
-shown instead.
-
-Signed-off-by: Ross Burton 

- libopkg/conffile.c | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/libopkg/conffile.c b/libopkg/conffile.c
-index b2f2469..7b4b87b 100644
 a/libopkg/conffile.c
-+++ b/libopkg/conffile.c
-@@ -51,6 +51,11 @@ int conffile_has_been_modified(conffile_t * conffile)
- }
- 
- root_filename = root_filename_alloc(filename);
-+if (!file_exists(root_filename)) {
-+opkg_msg(INFO, "Conffile %s deleted\n", conffile->name);
-+free(root_filename);
-+return 1;
-+}
- 
- md5sum = file_md5sum_alloc(root_filename);
- 
--- 
-2.8.1
diff --git a/meta/recipes-devtools/opkg/opkg_0.3.4.bb 
b/meta/recipes-devtools/opkg/opkg_0.3.5.bb
similarity index 93%
rename from meta/recipes-devtools/opkg/opkg_0.3.4.bb
rename to meta/recipes-devtools/opkg/opkg_0.3.5.bb
index a21fde1..3e511b6 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.4.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.3.5.bb
@@ -15,11 +15,10 @@ SRC_URI = 
"http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
file://opkg-configure.service \
file://opkg.conf \

file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
-   file://status-conffile.patch \
 "
 
-SRC_URI[md5sum] = "6c52a065499056a196e0b45a27e392de"
-SRC_URI[sha256sum] = 
"750b900b53b62a9b280b601a196f02da81091eda2f3478c509512aa5a1ec93be"
+SRC_URI[md5sum] = "d202d09ea0932943071b842626cab13c"
+SRC_URI[sha256sum] = 
"734bc21dea11262113fa86b928d09812618b3966f352350cf916a6ae0d343f32"
 
 inherit autotools pkgconfig systemd
 
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] extensible SDK doesn't install when initramfs is bundled with kernel?

[Aaron_Wright]

> Hi,
> 
> It looks like I can't install the extensible SDK if my initramfs is 
bundled
> with the kernel.
> 
> I am building two images - my-image & my-image-initramfs (which are 
mostly
> identical at the moment). I have also set
> INITRAMFS_IMAGE = "my-image-initramfs"
> INITRAMFS_IMAGE_BUNDLE = "1"
> 
> So far so good and things work as expected, I can build image +
> kernel/initramfs fine.
> 
> 
> Installation of the extensible SDK generated using
> bitbake -c populate_sdk_ext my-image or
> bitbake -c populate_sdk_ext my-image-initramfs
> fails though:
> 
> ---snip---
> Parsing recipes...done.
> Parsing of 1804 .bb files complete (0 cached, 1804 parsed). 2362 
targets, 384 skipped, 0 masked, 0 errors.
> NOTE: Resolving any missing task queue dependencies
> Initialising tasks...Initialising tasks...WARNING: The 
linux-ramips:do_bundle_initramfs sig is computed to be 
e434881eda830ba400719204a1e49b8d, but the sig is locked to 
2b272ac304fd389f7a0745bbe3d4efe8 in SIGGEN_LOCKEDSIGS_t-tgm-r1a
> done.
> NOTE: Executing SetScene Tasks
> NOTE: Running setscene task 7 of 516 
(/space/rel-test/poky-rootfs_sdk/layers/poky/meta/recipes-core/base-files/base-files_3.0.14.bb:do_package_qa_setscene)
> NOTE: Running setscene task 8 of 516 
/space/rel-test/poky-rootfs_sdk/layers/poky/meta/recipes-core/util-linux/util-linux_2.28.bb:do_package_qa_setscene)
> [...]
> NOTE: Running setscene task 516 of 516 
/space/rel-test/poky-rootfs_sdk/layers/poky/meta/recipes-devtools/quilt/quilt-native_0.64.bb:do_populate_sysroot_setscene)
> NOTE: recipe quilt-native-0.64-r0: task do_populate_sysroot_setscene: 
Started
> NOTE: recipe quilt-native-0.64-r0: task do_populate_sysroot_setscene: 
Succeeded
> NOTE: Executing RunQueue Tasks
> ERROR: Task linux-ramips.do_fetch attempted to execute unexpectedly
> ERROR: Task linux-ramips.do_unpack attempted to execute unexpectedly
> ERROR: Task linux-ramips.do_kernel_checkout attempted to execute 
unexpectedly
> ERROR: Task linux-ramips.do_validate_branches attempted to execute 
unexpectedly
> ERROR: Task linux-ramips.do_kernel_metadata attempted to execute 
unexpectedly
> ERROR: Task linux-ramips.do_patch attempted to execute unexpectedly
> ERROR: Task linux-ramips.do_kernel_configme attempted to execute 
unexpectedly
> ERROR: Task linux-ramips.do_configure attempted to execute unexpectedly
> ERROR: Task linux-ramips.do_kernel_configcheck attempted to execute 
unexpectedly
> ERROR: Task linux-ramips.do_compile attempted to execute unexpectedly
> ERROR: Task linux-ramips.do_kernel_link_images attempted to execute 
unexpectedly
> ERROR: Task linux-ramips.do_compile_kernelmodules attempted to execute 
unexpectedly
> ERROR: Task linux-ramips.do_strip attempted to execute unexpectedly
> ERROR: Task linux-ramips.do_sizecheck attempted to execute unexpectedly
> ERROR: Task linux-ramips.do_uboot_mkimage attempted to execute 
unexpectedly
> ERROR: Task linux-ramips.do_install attempted to execute unexpectedly
> ERROR: Task linux-ramips.do_populate_sysroot attempted to execute 
unexpectedly and should have been setscened
> ERROR: Task linux-ramips.do_bundle_initramfs attempted to execute 
unexpectedly
> NOTE: Tasks Summary: Attempted 1541 tasks of which 1541 didn't need to 
be rerun and all succeeded.
> 
> Summary: There were 2 WARNING messages shown.
> Summary: There were 18 ERROR messages shown, returning a non-zero exit 
code.
> ---snap---
> 
> 
> Installation works fine though once I comment out INITRAMFS_IMAGE.
> 
> Any pointers for to how to resolve this while keeping kernel and 
initramfs
> bundled would be greatly appreciated!
> 
> 
> Cheers,
> Andre'

I'm running up against this problem right now on morty. Was this ever 
resolved?-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] opkg-utils: bump PV to 0.3.5

[Alejandro del Castillo]

Signed-off-by: Alejandro del Castillo 
---
 meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb 
b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index ed5980b..f72b7a4 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 
'virtual/update-alternatives', '', d)}"
 
 SRCREV = "1a708fd73d10c2b7677dd4cc4e017746ebbb9166"
-PV = "0.3.4+git${SRCPV}"
+PV = "0.3.5+git${SRCPV}"
 
 SRC_URI = "git://git.yoctoproject.org/opkg-utils \
file://0001-Switch-all-scripts-to-use-Python-3.x.patch \
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/3] package_deb: Drop obsolete comments/variables

[Tom Rini]

On Thu, Jun 15, 2017 at 07:05:07PM +0100, Richard Purdie wrote:

> These comments/variables appear to be long dead, remove them.
> 
> Signed-off-by: Richard Purdie 

Reviewed-by: Tom Rini 

-- 
Tom
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 05/10] gobject-introspection: Disable generating static lbraries

[Khem Raj]

On Thu, Jun 15, 2017 at 1:46 PM, Alexander Kanavin
 wrote:
> On 06/15/2017 07:02 PM, Khem Raj wrote:
>>
>> On Thu, Jun 15, 2017 at 2:50 AM, Alexander Kanavin
>>  wrote:
>>>
>>> On 06/14/2017 06:23 PM, Khem Raj wrote:


 Signed-off-by: Khem Raj 
>>>
>>>
>>>
>>> Why? You need to add an explanation to the commit message.
>>>
>> sure, its to avoid linking with .a when using pie
>
>
>
> Can you resend the patch please?

Updated on pull request branch
http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/hardening-fixes=ea442af4b3a7669485a18d57fbb043d9093189bc

>
> Alex
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/3] oeqa/core/loader.py: Fix _make_failed_test for python >= 3.4.4

[Aníbal Limón]

Python unittest change the signature of the _make_failed_test
after python 3.4.4 don't pass the method name.

Signed-off-by: Aníbal Limón 
---
 meta/lib/oeqa/core/loader.py | 22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py
index 229f094..80e3d28 100644
--- a/meta/lib/oeqa/core/loader.py
+++ b/meta/lib/oeqa/core/loader.py
@@ -12,15 +12,19 @@ from oeqa.core.case import OETestCase
 from oeqa.core.decorator import decoratorClasses, OETestDecorator, \
 OETestFilter, OETestDiscover
 
-def _make_failed_test(classname, methodname, exception, suiteClass):
-"""
-When loading tests, the unittest framework stores any exceptions and
-displays them only when the 'run' method is called.
-
-For our purposes, it is better to raise the exceptions in the loading
-step rather than waiting to run the test suite.
-"""
-raise exception
+if sys.version_info >= (3,4,4):
+def _make_failed_test(classname, methodname, exception, suiteClass):
+"""
+When loading tests, the unittest framework stores any exceptions 
and
+displays them only when the 'run' method is called.
+
+For our purposes, it is better to raise the exceptions in the 
loading
+step rather than waiting to run the test suite.
+"""
+raise exception
+else:
+def _make_failed_test(classname, exception, suiteClass):
+raise exception
 unittest.loader._make_failed_test = _make_failed_test
 
 def _find_duplicated_modules(suite, directory):
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 3/3] oeqa/selftest/context: Reload testlayer_path when meta-selftest isn't added

[Aníbal Limón]

When add meta-selftest by the script the testlayer_path needs to be
reloaded to avoid None value.

Signed-off-by: Aníbal Limón 
---
 meta/lib/oeqa/selftest/context.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/lib/oeqa/selftest/context.py 
b/meta/lib/oeqa/selftest/context.py
index 8c8439b..ca87398 100644
--- a/meta/lib/oeqa/selftest/context.py
+++ b/meta/lib/oeqa/selftest/context.py
@@ -131,6 +131,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor):
 runCmd("bitbake-layers add-layer %s" %meta_selftestdir)
 # reload data is needed because a meta-selftest layer was 
add
 self.tc.td = get_bb_vars()
+self.tc.testlayer_path = get_test_layer()
 else:
 self.tc.logger.error("could not locate meta-selftest 
in:\n%s" % meta_selftestdir)
 raise OEQAPreRun
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/3] oeqa/core/threaded: Don't assume that results exists on logDetails

[Aníbal Limón]

Signed-off-by: Aníbal Limón 
---
 meta/lib/oeqa/core/threaded.py | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oeqa/core/threaded.py b/meta/lib/oeqa/core/threaded.py
index c6058a3..2cafe03 100644
--- a/meta/lib/oeqa/core/threaded.py
+++ b/meta/lib/oeqa/core/threaded.py
@@ -185,9 +185,10 @@ class OETestResultThreaded(object):
 self.tc.logger.info(msg)
 
 def logDetails(self):
-tid = list(self._results)[0]
-result = self._results[tid]['result']
-result.logDetails()
+if list(self._results):
+tid = list(self._results)[0]
+result = self._results[tid]['result']
+result.logDetails()
 
 class _Worker(threading.Thread):
 """Thread executing tasks from a given tasks queue"""
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][v4][PATCH 2/2] ghostscript: add X11 PACKAGECONFIG info

[Joe Slater]

Add information necessary to build for x11, but
do not enable that option.

Fix parallel build directory creation issue.

Signed-off-by: Joe Slater 
---
 meta/recipes-extended/ghostscript/ghostscript_9.21.bb | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.21.bb 
b/meta/recipes-extended/ghostscript/ghostscript_9.21.bb
index ed0fd43..fb36a13 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.21.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.21.bb
@@ -48,7 +48,21 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
 SRC_URI[md5sum] = "5f213281761d2750fcf27476c404d17f"
 SRC_URI[sha256sum] = 
"02bceadbc4dddeb6f2eec9c8b1623d945d355ca11b8b4df035332b217d58ce85"
 
-EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
+# Put something like
+#
+#   PACKAGECONFIG_append_pn-ghostscript = " x11"
+#
+# in local.conf to enable building with X11.  Be careful.  The order
+# of the overrides matters!
+#
+#PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', 
d)}"
+PACKAGECONFIG_class-native = ""
+
+PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} 
--x-libraries=${STAGING_LIBDIR}, \
+  --without-x, virtual/libx11 libxext libxt gtk+3\
+  "
+
+EXTRA_OECONF = "--with-system-libtiff --without-jbig2dec \
 --with-fontpath=${datadir}/fonts \
 --without-libidn --with-cups-serverbin=${exec_prefix}/lib/cups 
\
 --with-cups-datadir=${datadir}/cups \
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][v4][PATCH 1/2] ghostscript: move to version 9.21

[Joe Slater]

Eliminate CVE patches that are now in source.

Add CUPSCONFIG to configure options.

Signed-off-by: Joe Slater 

to be scrunched

Signed-off-by: Joe Slater 
---
 .../ghostscript/ghostscript/CVE-2016-10219.patch   | 49 ---
 .../ghostscript/ghostscript/CVE-2016-10220.patch   | 55 --
 .../ghostscript/ghostscript/CVE-2016-7978.patch| 30 
 .../ghostscript/ghostscript/CVE-2016-7979.patch| 48 ---
 .../ghostscript/ghostscript/CVE-2016-8602.patch| 47 --
 .../ghostscript/ghostscript/CVE-2017-7975.patch| 23 -
 .../ghostscript/avoid-host-contamination.patch | 19 
 ...t-9.21-native-fix-disable-system-libtiff.patch} | 22 -
 ... => ghostscript-9.21-prevent_recompiling.patch} | 25 +-
 .../ghostscript/ghostscript/mkdir-p.patch  | 36 ++
 .../{ghostscript_9.20.bb => ghostscript_9.21.bb}   | 20 
 11 files changed, 98 insertions(+), 276 deletions(-)
 delete mode 100644 
meta/recipes-extended/ghostscript/ghostscript/CVE-2016-10219.patch
 delete mode 100644 
meta/recipes-extended/ghostscript/ghostscript/CVE-2016-10220.patch
 delete mode 100644 
meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7978.patch
 delete mode 100644 
meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7979.patch
 delete mode 100644 
meta/recipes-extended/ghostscript/ghostscript/CVE-2016-8602.patch
 create mode 100644 
meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
 rename 
meta/recipes-extended/ghostscript/ghostscript/{ghostscript-native-fix-disable-system-libtiff.patch
 => ghostscript-9.21-native-fix-disable-system-libtiff.patch} (67%)
 rename 
meta/recipes-extended/ghostscript/ghostscript/{ghostscript-9.02-prevent_recompiling.patch
 => ghostscript-9.21-prevent_recompiling.patch} (81%)
 create mode 100644 meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch
 rename meta/recipes-extended/ghostscript/{ghostscript_9.20.bb => 
ghostscript_9.21.bb} (87%)

diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-10219.patch 
b/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-10219.patch
deleted file mode 100644
index 574abe0..000
--- a/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-10219.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4bef1a1d32e29b68855616020dbff574b9cda08f Mon Sep 17 00:00:00 2001
-From: Robin Watts 
-Date: Thu, 29 Dec 2016 15:57:43 +
-Subject: [PATCH] Bug 697453: Avoid divide by 0 in scan conversion code.
-
-Arithmetic overflow due to extreme values in the scan conversion
-code can cause a division by 0.
-
-Avoid this with a simple extra check.
-
-  dx_old=cf814d81
-  endp->x_next=b0e859b9
-  alp->x_next=8069a73a
-
-leads to dx_den = 0
-
-Upstream-Status: Backport
-CVE: CVE-2016-10219
-
-Signed-off-by: Catalin Enache 

- base/gxfill.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/base/gxfill.c b/base/gxfill.c
-index 99196c0..2f81bb0 100644
 a/base/gxfill.c
-+++ b/base/gxfill.c
-@@ -1741,7 +1741,7 @@ intersect(active_line *endp, active_line *alp, fixed y, 
fixed y1, fixed *p_y_new
- fixed dx_old = alp->x_current - endp->x_current;
- fixed dx_den = dx_old + endp->x_next - alp->x_next;
- 
--if (dx_den <= dx_old)
-+if (dx_den <= dx_old || dx_den == 0)
- return false; /* Intersection isn't possible. */
- dy = y1 - y;
- if_debug3('F', "[F]cross: dy=%g, dx_old=%g, dx_new=%g\n",
-@@ -1750,7 +1750,7 @@ intersect(active_line *endp, active_line *alp, fixed y, 
fixed y1, fixed *p_y_new
- /* Do the computation in single precision */
- /* if the values are small enough. */
- y_new =
--((dy | dx_old) < 1L << (size_of(fixed) * 4 - 1) ?
-+(((ufixed)(dy | dx_old)) < (1L << (size_of(fixed) * 4 - 1)) ?
-  dy * dx_old / dx_den :
-  (INCR_EXPR(mq_cross), fixed_mult_quo(dy, dx_old, dx_den)))
- + y;
--- 
-2.10.2
-
diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-10220.patch 
b/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-10220.patch
deleted file mode 100644
index 5e1e8ba..000
--- a/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-10220.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From daf85701dab05f17e924a48a81edc9195b4a04e8 Mon Sep 17 00:00:00 2001
-From: Ken Sharp 
-Date: Wed, 21 Dec 2016 16:54:14 +
-Subject: [PATCH] fix crash with bad data supplied to makeimagedevice
-
-Bug #697450 "Null pointer dereference in gx_device_finalize()"
-
-The problem here is that the code to finalise a device unconditionally
-frees the icc_struct member of the device structure. However this
-particular (weird) device is not setup as a normal device, probably
-because its very, very ancient. Its possible for the initialisation
-of the device to abort with an error before 

Re: [OE-core] [PATCH 05/10] gobject-introspection: Disable generating static lbraries

[Alexander Kanavin]

On 06/15/2017 07:02 PM, Khem Raj wrote:

On Thu, Jun 15, 2017 at 2:50 AM, Alexander Kanavin
 wrote:

On 06/14/2017 06:23 PM, Khem Raj wrote:


Signed-off-by: Khem Raj 



Why? You need to add an explanation to the commit message.


sure, its to avoid linking with .a when using pie



Can you resend the patch please?

Alex

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work without PATCHTOOL = "git"

[Alexander Kanavin]

On 06/15/2017 06:33 PM, Peter Kjellerstedt wrote:

It turns out the problem is only seen if opengl is enabled in
DISTRO_FEATURES. However, since that is the default for poky, that still
does not explain why others do not see the problem

I have included the log.do_compile file where one can see that the
file gdkx-with-gl-context.h is missing (that is the file that was
supposed to be renamed from gdkx.h by the patch). When I look in
tmp/work/i586-poky-linux/gtk+3/3.22.15-r0/gtk+-3.22.15/gdk/x11 I see
gdkx.h and gdkx-without-gl-context.h, instead of the expected
gdkx-with-gl-context.h and gdkx-without-gl-context.h...


I guess Jussi needs to look at this, as he's maintaining the patches and 
the recipe.


Alex

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] toolchain-scripts: add check for LD_LIBRARY_PATH in the SDK env setup script

[Denys Dmytriyenko]

From: Denys Dmytriyenko 

Provide a descriptive error message and exit the environment-setup script,
when LD_LIBRARY_PATH is set on the host system.

Signed-off-by: Denys Dmytriyenko 
---
 meta/classes/toolchain-scripts.bbclass | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/meta/classes/toolchain-scripts.bbclass 
b/meta/classes/toolchain-scripts.bbclass
index 260ece9..ef7b26f 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -25,6 +25,21 @@ toolchain_create_sdk_env_script () {

script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-$multimach_target_sys}
rm -f $script
touch $script
+
+   echo '# Check for LD_LIBRARY_PATH being set, which can break SDK and 
generally is a bad practice' >> $script
+   echo '# 
http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html#AEN80' >> 
$script
+   echo '# http://xahlee.info/UnixResource_dir/_/ldpath.html' >> $script
+   echo '# Only disable this check if you are absolutely know what you are 
doing!' >> $script
+   echo 'if [ ! -z "$LD_LIBRARY_PATH" ]; then' >> $script
+   echo "echo \"Your environment is misconfigured, you probably need 
to 'unset LD_LIBRARY_PATH'\"" >> $script
+   echo "echo \"but please check why this was set in the first place 
and that it's safe to unset.\"" >> $script
+   echo 'echo "The SDK will not operate correctly in most cases when 
LD_LIBRARY_PATH is set."' >> $script
+   echo 'echo "For more references see:"' >> $script
+   echo 'echo "  
http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html#AEN80;' >> 
$script
+   echo 'echo "  http://xahlee.info/UnixResource_dir/_/ldpath.html;' 
>> $script
+   echo 'return 1' >> $script
+   echo 'fi' >> $script
+
echo 'export SDKTARGETSYSROOT='"$sysroot" >> $script
EXTRAPATH=""
for i in ${CANADIANEXTRAOS}; do
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for "package_deb: Drop obsolete com..." and 2 more

[Patchwork]

== Series Details ==

Series: "package_deb: Drop obsolete com..." and 2 more
Revision: 1
URL   : https://patchwork.openembedded.org/series/7274/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series cannot be parsed correctly due to malformed diff 
lines [test_mbox_format] 
  Suggested fixCreate the series again using git-format-patch and ensure it 
can be applied using git am
  Diff line diff --git 
a/meta/recipes-devtools/gcc/gcc-5.4/0054-support-ffile-prefix-map.patch 
b/meta/recipes-devtools/gcc/gcc-5.4/0054-support-ffile-prefix-map.patch


* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 059846662f)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2 1/4] masterimage.py: fix issue with calling reboot on masterimage/DUT

[Stephano Cetola]

On 06/15, Zeeshan Ali (Khattak) wrote:
> Hi,
> 
> Has this been already merged? I ask cause there is a small change
> needed for large-enough rootfs:
> 
This has not been merged yet.

Erik, could you please send a V3?

When you do so, please reference the bug in the commit messages like this:

[YOCTO #11524]

Thanks!

Cheers,
Stephano
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/3] package_deb: Drop obsolete comments/variables

[Richard Purdie]

These comments/variables appear to be long dead, remove them.

Signed-off-by: Richard Purdie 
---
 meta/classes/package_deb.bbclass | 10 --
 meta/classes/rootfs_deb.bbclass  |  3 ---
 2 files changed, 13 deletions(-)

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 9cab80b..7bfdf81 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -39,16 +39,6 @@ def debian_arch_map(arch, tune):
 if arch == "arm":
 return arch + ["el", "hf"]["callconvention-hard" in tune_features]
 return arch
-#
-# install a bunch of packages using apt
-# the following shell variables needs to be set before calling this func:
-# INSTALL_ROOTFS_DEB - install root dir
-# INSTALL_BASEARCH_DEB - install base architecutre
-# INSTALL_ARCHS_DEB - list of available archs
-# INSTALL_PACKAGES_NORMAL_DEB - packages to be installed
-# INSTALL_PACKAGES_ATTEMPTONLY_DEB - packages attempted to be installed only
-# INSTALL_PACKAGES_LINGUAS_DEB - additional packages for uclibc
-# INSTALL_TASK_DEB - task name
 
 python do_package_deb () {
 from multiprocessing import Process
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 10af4b5..12002c4 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -32,6 +32,3 @@ python () {
 elif darch == "arm":
  d.setVar('DEB_SDK_ARCH', 'armel')
 }
-
-# This will of course only work after rootfs_deb_do_rootfs or populate_sdk_deb 
has been called
-DPKG_QUERY_COMMAND = "${STAGING_BINDIR_NATIVE}/dpkg-query 
--admindir=$INSTALL_ROOTFS_DEB/var/lib/dpkg"
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] core-image-sato: drop packagegroup-core-x11-sato-games from IMAGE_INSTALL

[liu . ming50]

From: Ming Liu 

packagegroup-core-x11-sato-games package is being RDEPENDS by
packagegroup-core-x11-sato, hence will be installed if x11-sato is
choosen in IMAGE_FEATURES. So it's unnecessary appending it into
IMAGE_INSTALL.

Even worse, it's causing the following error when x11 is not
in DISTRO_FEATURES:
| ERROR: Required build target 'core-image-sato' has no buildable providers.
| Missing or unbuildable dependency chain was: ['core-image-sato', 
'packagegroup-core-x11-sato-games']

Signed-off-by: Ming Liu 
---
 meta/recipes-sato/images/core-image-sato.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-sato/images/core-image-sato.bb 
b/meta/recipes-sato/images/core-image-sato.bb
index 99dad11..b897950 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -8,7 +8,5 @@ LICENSE = "MIT"
 
 inherit core-image
 
-IMAGE_INSTALL += "packagegroup-core-x11-sato-games"
-
 TOOLCHAIN_HOST_TASK_append = " nativesdk-intltool nativesdk-glib-2.0"
 TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " nativesdk-intltool 
nativesdk-glib-2.0"
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] image_types.bbclass: get rid of IMAGE_DEPENDS

[Leonardo Sandoval]

On Thu, 2017-06-15 at 17:47 +0100, Burton, Ross wrote:
> 
> On 15 June 2017 at 17:51, Leonardo Sandoval
>  wrote:
> also, should it be a warning instead?
> 
> 
> 
> Not if the logic to use the value has been deleted!

Oh, I see that logic removal! sorry for the noise.

> 
> Ross 
> 
> 


-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] image_types.bbclass: get rid of IMAGE_DEPENDS

[Burton, Ross]

On 15 June 2017 at 17:51, Leonardo Sandoval <
leonardo.sandoval.gonza...@linux.intel.com> wrote:

> also, should it be a warning instead?
>

Not if the logic to use the value has been deleted!

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] image_types.bbclass: get rid of IMAGE_DEPENDS

[Leonardo Sandoval]

On Thu, 2017-06-15 at 19:19 +0300, Ed Bartosh wrote:

> +if d.getVar('IMAGE_DEPENDS') != None:
> +bb.fatal('IMAGE_DEPENDS is deprecated. Use do_image_[depends] 
> += ":>" instead')

s/>>/>/

also, should it be a warning instead?





-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH resend] qemuboot.conf: make cpus match built artifacts

[Burton, Ross]

On 15 June 2017 at 17:17, Martin Kelly  wrote:

> I am no expert, but running qemu -cpu help just says:
>
> kvm32 - "Common 32-bit KVM processor"
> kvm64 - "Common 64-bit KVM processor"
>
> My best guess is that, running on qemu without kvm, both cases will be
> slow (since it's all software emulation). But, using qemu -kvm, it should
> be fast as long as you run on a native CPU that is core2duo or better, as
> the native instructions can just be exposed and passed through to the host.
> Since core2duo is very old by now, it should be fast for virtually everyone
> building on x86.
>

Right, I did some digging.  Assuming you have KVM enabled then in the
general case the -cpu option is irrelevant as the instructions are handled
natively.  -cpu just changes what CPUID flags the userspace sees, and so
this is the Right Thing To Do.

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v2] image_types.bbclass: get rid of IMAGE_DEPENDS

[Ed Bartosh]

The IMAGE_DEPENDS variable can be overriden to add dependencies for
individual image types.  Those dependencies are added to the do_rootfs
task, while they really should be added to the specific image type tasks.

Also, the IMAGE_DEPENDS variable is not documented anywhere.

Replaced usage of IMAGE_DEPENDS with explicitly added
dependencies to do_image_ tasks.

[YOCTO #11302]

Signed-off-by: Ed Bartosh 
---
 meta/classes/image_types.bbclass | 41 +++-
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 7749b00..cca2a07 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -29,12 +29,6 @@ def imagetypes_getdepends(d):
 deps = set()
 for typestring in fstypes:
 basetype, resttypes = split_types(typestring)
-adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype) , deps)
-
-for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype) or 
"").split():
-base, rest = split_types(typedepends)
-adddep(d.getVar('IMAGE_DEPENDS_%s' % base) , deps)
-resttypes += rest
 
 for ctype in resttypes:
 adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype), deps)
@@ -101,7 +95,7 @@ IMAGE_CMD_squashfs-lzo = "mksquashfs ${IMAGE_ROOTFS} 
${IMGDEPLOYDIR}/${IMAGE_NAM
 # you need special parameters (like --xattrs) which are only supported
 # by GNU tar upstream >= 1.27, then override that default:
 # IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*"
-# IMAGE_DEPENDS_tar_append = " tar-replacement-native"
+# do_image_tar[depends] += "tar-replacement-native:do_populate_sysroot"
 # EXTRANATIVEPATH += "tar-native"
 #
 # The GNU documentation does not specify whether --xattrs-include is necessary.
@@ -209,21 +203,24 @@ EXTRA_IMAGECMD_ext4 ?= "-i 4096"
 EXTRA_IMAGECMD_btrfs ?= "-n 4096"
 EXTRA_IMAGECMD_elf ?= ""
 
-IMAGE_DEPENDS = ""
-IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
-IMAGE_DEPENDS_cramfs = "util-linux-native"
-IMAGE_DEPENDS_ext2 = "e2fsprogs-native"
-IMAGE_DEPENDS_ext3 = "e2fsprogs-native"
-IMAGE_DEPENDS_ext4 = "e2fsprogs-native"
-IMAGE_DEPENDS_btrfs = "btrfs-tools-native"
-IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
-IMAGE_DEPENDS_squashfs-xz = "squashfs-tools-native"
-IMAGE_DEPENDS_squashfs-lzo = "squashfs-tools-native"
-IMAGE_DEPENDS_elf = "virtual/kernel mkelfimage-native"
-IMAGE_DEPENDS_ubi = "mtd-utils-native"
-IMAGE_DEPENDS_ubifs = "mtd-utils-native"
-IMAGE_DEPENDS_multiubi = "mtd-utils-native"
-IMAGE_DEPENDS_wic = "parted-native"
+python () {
+if d.getVar('IMAGE_DEPENDS') != None:
+bb.fatal('IMAGE_DEPENDS is deprecated. Use do_image_[depends] += 
":>" instead')
+}
+
+do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot"
+do_image_cramfs[depends] += "util-linux-native:do_populate_sysroot"
+do_image_ext2[depends] += "e2fsprogs-native:do_populate_sysroot"
+do_image_ext3[depends] += "e2fsprogs-native:do_populate_sysroot"
+do_image_ext4[depends] += "e2fsprogs-native:do_populate_sysroot"
+do_image_btrfs[depends] += "btrfs-tools-native:do_populate_sysroot"
+do_image_squashfs[depends] += "squashfs-tools-native:do_populate_sysroot"
+do_image_squashfs-xz[depends] += "squashfs-tools-native:do_populate_sysroot"
+do_image_squashfs-lzo[depends] += "squashfs-tools-native:do_populate_sysroot"
+do_image_elf[depends] += "virtual/kernel-native:do_populate_sysroot 
mkelfimage-native:do_populate_sysroot"
+do_image_ubi[depends] += "mtd-utils-native:do_populate_sysroot"
+do_image_ubifs[depends] += "mtd-utils-native:do_populate_sysroot"
+do_image_multiubi[depends] += "mtd-utils-native:do_populate_sysroot"
 
 # This variable is available to request which values are suitable for 
IMAGE_FSTYPES
 IMAGE_TYPES = " \
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH resend] qemuboot.conf: make cpus match built artifacts

[Martin Kelly]

On 06/15/2017 04:45 AM, Burton, Ross wrote:


On 2 May 2017 at 20:20, Martin Kelly > wrote:

-QB_CPU_KVM_x86-64 = "-cpu kvm64"
+QB_CPU_KVM_x86-64 = "-cpu core2duo"


What's the actual meaning of the "kvm64" and "kvm32" CPUs?  Is there a
performance hit?  Should we be instead changing the qemu machine to
target a different instruction set?



I am no expert, but running qemu -cpu help just says:

kvm32 - "Common 32-bit KVM processor"
kvm64 - "Common 64-bit KVM processor"

My best guess is that, running on qemu without kvm, both cases will be 
slow (since it's all software emulation). But, using qemu -kvm, it 
should be fast as long as you run on a native CPU that is core2duo or 
better, as the native instructions can just be exposed and passed 
through to the host. Since core2duo is very old by now, it should be 
fast for virtually everyone building on x86.


Regardless, the core issue here is not performance but merely making 
sure that binaries run without crashing in the emulated environment. We 
need to upgrade the emulation to match the binaries or downgrade the 
binaries to match the emulation (aka building against something even 
more ancient than core2duo). Further downgrading the CPU seems wrong to 
me because core2duo is already quite old.

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 05/10] gobject-introspection: Disable generating static lbraries

[Khem Raj]

On Thu, Jun 15, 2017 at 2:50 AM, Alexander Kanavin
 wrote:
> On 06/14/2017 06:23 PM, Khem Raj wrote:
>>
>> Signed-off-by: Khem Raj 
>
>
> Why? You need to add an explanation to the commit message.
>
sure, its to avoid linking with .a when using pie

> Alex
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCHv2 00/11] More fixes for file dependency generation with RPM

[Peter Kjellerstedt]

Bah, forgot to add:

Changed in PATCHv2:
* Removal of git cvsserver and git svn from git-perltools are now 
  controlled by PACKAGECONFIGs.

//Peter

> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> Peter Kjellerstedt
> Sent: den 15 juni 2017 17:38
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCHv2 00/11] More fixes for file dependency
> generation with RPM
> 
> This is the second take on restoring the file dependency support for
> RPM that was lost in Pyro. These changes should fix most (all?)
> problems that were seen on the autobuilders after the first set of
> changes were introduced.
> 
> The first patch is not strictly needed for this, but it fixes a build
> problem due to a renamed file in a patch file that I got when building
> core-image-sato. No idea why no one else has had problems with this...
> 
> //Peter
> 
> The following changes since commit
> 2bf2ab9fcd12b179c396d2d4b4603b774a37eef6:
> 
>   bitbake: bitbake-user-manual: Updated BBLAYERS_FETCH_DIR variable
> description (2017-06-15 11:15:59 +0100)
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib pkj/rpm_regressions2
>   http://git.yoctoproject.org/cgit.cgi/poky-
> contrib/log/?h=pkj/rpm_regressions2
> 
> Peter Kjellerstedt (11):
>   gtk+3: Update the patches to work without PATCHTOOL = "git"
>   perl: Do not generate file dependencies for perl-ptest
>   rpm: Add dependencies on bash, perl and python3-core
>   linux-firmware: Avoid a dependency on python-core
>   texi2html: Add a dependency on perl
>   git: Add a dependency on perl for gitweb
>   git: Do not install git cvsserver and git svn by default
>   texinfo: Avoid a problem with a dependency on
> perl(Locale::gettext_xs)
>   package_rpm.bbclass: Filter out unwanted file deps for nativesdk
> packages
>   insane.bbclass: Ignore perl as dependency for nativesdk packages
>   package.bbclass: Restore functionality to detect RPM dependencies
> 
>  meta/classes/insane.bbclass|   2 +-
>  meta/classes/package.bbclass   |   5 +-
>  meta/classes/package_rpm.bbclass   |  25 +-
>  meta/lib/oe/package.py |  60 +++--
>  meta/recipes-devtools/git/git.inc  |  23 +-
>  meta/recipes-devtools/perl/perl-ptest.inc  |   4 +
>  meta/recipes-devtools/rpm/rpm_git.bb   |   5 +
>  meta/recipes-extended/texi2html/texi2html_5.0.bb   |   2 +
>  meta/recipes-extended/texinfo/texinfo_6.3.bb   |   6 +
>  .../gtk+/gtk+3/0001-Hardcoded-libtool.patch|  12 +-
>  ...Do-not-try-to-initialize-GL-without-libGL.patch |   8 +-
>  .../0003-Add-disable-opengl-configure-option.patch | 268
> +++--
>  ...4-configure.ac-Fix-wayland-protocols-path.patch |   8 +-
>  .../linux-firmware/linux-firmware_git.bb   |   3 +
>  14 files changed, 317 insertions(+), 114 deletions(-)
> 
> --
> 2.12.0
> 
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 08/11] texinfo: Avoid a problem with a dependency on perl(Locale::gettext_xs)

[Peter Kjellerstedt]

We do not build the Locale::gettext_xs Perl module and the code will
test for it and happily use Locale::gettext_pp instead if it is not
found. However, this still causes a file dependency on
perl(Locale::gettext_xs) to be generated, which must be satisfied by
adding an explicit provide for it.

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-extended/texinfo/texinfo_6.3.bb | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-extended/texinfo/texinfo_6.3.bb 
b/meta/recipes-extended/texinfo/texinfo_6.3.bb
index d82731e11e..f58df928aa 100644
--- a/meta/recipes-extended/texinfo/texinfo_6.3.bb
+++ b/meta/recipes-extended/texinfo/texinfo_6.3.bb
@@ -79,4 +79,10 @@ FILES_${PN}-doc = "${infodir}/texinfo* \
${datadir}/${tex_texinfo} \
${mandir}/man1 ${mandir}/man5"
 
+# Lie about providing the Locale::gettext_xs module. It is not actually built,
+# but the code will test for it and if not found use Locale::gettext_pp 
instead.
+# However, this causes a file dependency on perl(Locale::gettext_xs) to be
+# generated, which must be satisfied.
+RPROVIDES_${PN} += "perl(Locale::gettext_xs)"
+
 BBCLASSEXTEND = "native nativesdk"
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 01/11] gtk+3: Update the patches to work without PATCHTOOL = "git"

[Peter Kjellerstedt]

The patch "0003-Add-disable-opengl-configure-option.patch" used Git
rename syntax, which is not supported by quilt.

Signed-off-by: Peter Kjellerstedt 
---
 .../gtk+/gtk+3/0001-Hardcoded-libtool.patch|  12 +-
 ...Do-not-try-to-initialize-GL-without-libGL.patch |   8 +-
 .../0003-Add-disable-opengl-configure-option.patch | 268 +++--
 ...4-configure.ac-Fix-wayland-protocols-path.patch |   8 +-
 4 files changed, 207 insertions(+), 89 deletions(-)

diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch 
b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch
index 0bda1f1074..c210bbc7d5 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch
@@ -1,4 +1,4 @@
-From 5a73a5b92566e314bbc8a1bd40f1ec204837c111 Mon Sep 17 00:00:00 2001
+From 0ecaa5bab162abf0cb2057d77beeb7b89d5873b4 Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen 
 Date: Tue, 21 Jun 2016 14:53:56 +0300
 Subject: [PATCH 1/4] Hardcoded libtool
@@ -12,10 +12,10 @@ Signed-off-by: Jussi Kukkonen 
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 23d3077..b6931d6 100644
+index 6628e21..f43ac09 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -610,7 +610,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc 
files])
+@@ -617,7 +617,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc 
files])
  case $enable_explicit_deps in
auto)
  export SED
@@ -24,7 +24,7 @@ index 23d3077..b6931d6 100644
  if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = 
xyes ; then
enable_explicit_deps=yes
  else
-@@ -876,7 +876,7 @@ else
+@@ -895,7 +895,7 @@ else
  dnl Now we check to see if our libtool supports shared lib deps
  dnl (in a rather ugly way even)
  if $dynworks; then
@@ -33,7 +33,7 @@ index 23d3077..b6931d6 100644
  module_deplibs_check=`$module_libtool_config | \
  grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
  sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -1630,7 +1630,7 @@ AC_SUBST(GTK_PRINT_BACKENDS)
+@@ -1649,7 +1649,7 @@ AC_SUBST(GTK_PRINT_BACKENDS)
  # We are using gmodule-no-export now, but I'm leaving the stripping
  # code in place for now, since pango and atk still require gmodule.
  export SED
@@ -43,5 +43,5 @@ index 23d3077..b6931d6 100644
GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
 -- 
-2.1.4
+2.12.0
 
diff --git 
a/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
 
b/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
index 989716e513..ab7b659414 100644
--- 
a/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
+++ 
b/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
@@ -1,4 +1,4 @@
-From d63b926f8c8d8b5c9f9ec33d078b775f0409d88a Mon Sep 17 00:00:00 2001
+From 2d2361f24be1e51201063dbbda570debe8702b6f Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen 
 Date: Fri, 16 Oct 2015 16:35:16 +0300
 Subject: [PATCH 2/4] Do not try to initialize GL without libGL
@@ -21,10 +21,10 @@ Signed-off-by: Jussi Kukkonen 
  2 files changed, 12 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index b6931d6..e27da49 100644
+index f43ac09..965eec9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -342,6 +342,13 @@ AC_ARG_ENABLE(mir-backend,
+@@ -346,6 +346,13 @@ AC_ARG_ENABLE(mir-backend,
[enable the Mir gdk backend])],
  [backend_set=yes])
  
@@ -56,5 +56,5 @@ index 81479d8..3c8c5c0 100644
  
  gint
 -- 
-2.1.4
+2.12.0
 
diff --git 
a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch 
b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
index e6ee21b64f..eaf6aec2aa 100644
--- 
a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
+++ 
b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
@@ -1,7 +1,7 @@
-From cdfd6216ac49fc7622d563d671a5b6511492827d Mon Sep 17 00:00:00 2001
+From a2e6b7cbbd6d741fed38d91b3742aa4a08395aba Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen 
 Date: Tue, 21 Jun 2016 15:11:39 +0300
-Subject: [PATCH] Add --disable-opengl configure option
+Subject: [PATCH 3/4] Add --disable-opengl configure option
 
 --disable-opengl will remove the dependency on libepoxy and on the
 OpenGL APIs. This is useful for those who want to keep using gtk+3
@@ -20,32 +20,34 @@ as it actually will depend on OpenGL.
 Upstream-Status: Inappropriate [Evil eye expected from upstream]
 Signed-off-by: Jussi Kukkonen 
 ---
- 

[OE-core] [PATCHv2 03/11] rpm: Add dependencies on bash, perl and python3-core

[Peter Kjellerstedt]

Also modify a Python script (pythondistdeps.py) to use Python 3.

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-devtools/rpm/rpm_git.bb | 5 +
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-devtools/rpm/rpm_git.bb 
b/meta/recipes-devtools/rpm/rpm_git.bb
index 2a0dcafac7..30702a7507 100644
--- a/meta/recipes-devtools/rpm/rpm_git.bb
+++ b/meta/recipes-devtools/rpm/rpm_git.bb
@@ -103,6 +103,9 @@ do_install_append_class-target() {
 
 do_install_append () {
sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}/${libdir}/rpm/macros
+
+   sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \
+   ${D}${libdir}/rpm/pythondistdeps.py
 }
 
 FILES_${PN} += "${libdir}/rpm-plugins/*.so \
@@ -117,3 +120,5 @@ FILES_python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*"
 
 # rpm 5.x was packaging the rpm build tools separately
 RPROVIDES_${PN} += "rpm-build"
+
+RDEPENDS_${PN} = "bash perl python3-core"
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 07/11] git: Do not install git cvsserver and git svn by default

[Peter Kjellerstedt]

These git commands require Perl modules that do not exist in OE-Core.
Add PACKAGECONFIGs to enable them. Be aware though that if you enable
them you must also provide the missing dependencies.

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-devtools/git/git.inc | 21 +
 1 file changed, 21 insertions(+)

diff --git a/meta/recipes-devtools/git/git.inc 
b/meta/recipes-devtools/git/git.inc
index 9b0d328bad..5c12ca8d4c 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -13,6 +13,10 @@ S = "${WORKDIR}/git-${PV}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
 
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[cvsserver] = ""
+PACKAGECONFIG[svn] = ""
+
 EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
--without-tcltk \
 "
@@ -54,6 +58,23 @@ perl_native_fixup () {
mkdir -p ${D}${libdir}
mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir}
rmdir -p ${D}${exec_prefix}/lib/perl-native || true
+
+   if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'cvsserver', d)}" ]; then
+   # Only install the git cvsserver command if explicitly requested
+   # as it requires the DBI Perl module, which does not exist in
+   # OE-Core.
+   rm ${D}${libexecdir}/git-core/git-cvsserver \
+  ${D}${bindir}/git-cvsserver
+   fi
+
+   if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'svn', d)}" ]; then
+   # Only install the git svn command and all Git::SVN Perl modules
+   # if explicitly requested as they require the SVN::Core Perl
+   # module, which does not exist in OE-Core.
+   rm -r ${D}${libexecdir}/git-core/git-svn \
+ ${D}${libdir}/perl/site_perl/*/Git/SVN*
+   sed -i -e '/SVN/d' 
${D}${libdir}/perl/site_perl/*/auto/Git/.packlist
+   fi
 }
 
 REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 09/11] package_rpm.bbclass: Filter out unwanted file deps for nativesdk packages

[Peter Kjellerstedt]

Filter out any file dependencies on absolute paths and any
dependencies on Perl modules for nativesdk packages. It is assumed
that they will be provided by the native host if needed, and they mess
up the dependency handling if they are present.

Signed-off-by: Peter Kjellerstedt 
---
 meta/classes/package_rpm.bbclass | 25 +++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index dc241975c3..5f29b45180 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -7,10 +7,28 @@ RPMBUILD="rpmbuild"
 
 PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms"
 
-# Maintaining the perfile dependencies has singificant overhead when writing 
the 
+# Maintaining the perfile dependencies has singificant overhead when writing 
the
 # packages. When set, this value merges them for efficiency.
 MERGEPERFILEDEPS = "1"
 
+# Filter dependencies based on a provided function.
+def filter_deps(var, f):
+import collections
+
+depends_dict = bb.utils.explode_dep_versions2(var)
+newdeps_dict = collections.OrderedDict()
+for dep in depends_dict:
+if f(dep):
+newdeps_dict[dep] = depends_dict[dep]
+return bb.utils.join_deps(newdeps_dict, commasep=False)
+
+# Filter out absolute paths (typically /bin/sh and /usr/bin/env) and any perl
+# dependencies for nativesdk packages.
+def filter_nativesdk_deps(srcname, var):
+if var and srcname.startswith("nativesdk-"):
+var = filter_deps(var, lambda dep: not dep.startswith('/') and dep != 
'perl' and not dep.startswith('perl('))
+return var
+
 # Construct per file dependencies file
 def write_rpm_perfiledata(srcname, d):
 workdir = d.getVar('WORKDIR')
@@ -26,7 +44,8 @@ def write_rpm_perfiledata(srcname, d):
 dependsflist = (d.getVar(dependsflist_key) or "")
 for dfile in dependsflist.split():
 key = "FILE" + varname + "_" + dfile + "_" + pkg
-depends_dict = bb.utils.explode_dep_versions(d.getVar(key) or 
"")
+deps = filter_nativesdk_deps(srcname, d.getVar(key) or "")
+depends_dict = bb.utils.explode_dep_versions(deps)
 file = dfile.replace("@underscore@", "_")
 file = file.replace("@closebrace@", "]")
 file = file.replace("@openbrace@", "[")
@@ -359,6 +378,8 @@ python write_specfile () {
 splitrdepends = splitrdepends + " " + get_perfile('RDEPENDS', pkg, 
d)
 splitrprovides = splitrprovides + " " + get_perfile('RPROVIDES', 
pkg, d)
 
+splitrdepends = filter_nativesdk_deps(srcname, splitrdepends)
+
 # Gather special src/first package data
 if srcname == splitname:
 srcrdepends= splitrdepends
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 05/11] texi2html: Add a dependency on perl

[Peter Kjellerstedt]

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-extended/texi2html/texi2html_5.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-extended/texi2html/texi2html_5.0.bb 
b/meta/recipes-extended/texi2html/texi2html_5.0.bb
index ae64816f82..afd125b08f 100644
--- a/meta/recipes-extended/texi2html/texi2html_5.0.bb
+++ b/meta/recipes-extended/texi2html/texi2html_5.0.bb
@@ -27,3 +27,5 @@ do_install_append () {
 }
 
 FILES_${PN}-doc += "${datadir}/texinfo"
+
+RDEPENDS_${PN} = "perl"
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 10/11] insane.bbclass: Ignore perl as dependency for nativesdk packages

[Peter Kjellerstedt]

Signed-off-by: Peter Kjellerstedt 
---
 meta/classes/insane.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index f6fd7c74d8..d57b98e04c 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -906,7 +906,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, 
packages, d):
 if "file-rdeps" not in skip:
 ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 
'rtld(GNU_HASH)'])
 if bb.data.inherits_class('nativesdk', d):
-ignored_file_rdeps |= set(['/bin/bash', '/usr/bin/perl'])
+ignored_file_rdeps |= set(['/bin/bash', '/usr/bin/perl', 
'perl'])
 # For Saving the FILERDEPENDS
 filerdepends = {}
 rdep_data = oe.packagedata.read_subpkgdata(pkg, d)
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 04/11] linux-firmware: Avoid a dependency on python-core

[Peter Kjellerstedt]

Remove the check_whence.py script since it is only needed to validate
the WHENCE file, and only if explicitly running `make check`.

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb 
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 4558dafdac..53089f2767 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -210,6 +210,9 @@ do_install() {
# Remove pointless bash script
rm ${D}${nonarch_base_libdir}/firmware/configure
 
+   # Remove python script used to check the WHENCE file
+   rm ${D}${nonarch_base_libdir}/firmware/check_whence.py
+
# Libertas sd8686
ln -sf libertas/sd8686_v9.bin 
${D}${nonarch_base_libdir}/firmware/sd8686.bin
ln -sf libertas/sd8686_v9_helper.bin 
${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 06/11] git: Add a dependency on perl for gitweb

[Peter Kjellerstedt]

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-devtools/git/git.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/git/git.inc 
b/meta/recipes-devtools/git/git.inc
index ade99ecfe0..9b0d328bad 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -118,6 +118,6 @@ FILES_${PN}-tk = " \
 
 PACKAGES =+ "gitweb"
 FILES_gitweb = "${datadir}/gitweb/"
-
+RDEPENDS_gitweb = "perl"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 11/11] package.bbclass: Restore functionality to detect RPM dependencies

[Peter Kjellerstedt]

During the transition to dnf and rpm4, the functionality to
automatically make RPM determine dependencies was lost.

Before the transition, an OE specific tool called rpmdeps-oecore had
been added to the rpm suit. It was based on the rpmdeps tool that is
part of rpm. For each file specified on its command line, it would
output the provides and requires that RPM could determine.

During the transition to rpm4, rpmdeps-oecore was replaced with the
standard rpmdeps. However, what no one noticed was that unless rpmdeps
is given options, e.g., -P or -R, to tell it what it should output, it
will not output anything. Thus, it would do all the work to determine
the requirements, but would keep silent about it. And since no output
from rpmdeps is expected unless there are requirements, there were no
warnings indicating that everything was not working as expected.

Porting the old rpmdeps-oecore to work with rpm4 is not really
possible since it relied on being able to access internals of RPM that
are no longer available. However, it turned out that rpmdeps had a
debug option, --rpmfcdebug, that would output exactly the information
that we need, albeit in a different format and to stderr. To make this
usable, rpmdeps has now received a new option, --alldeps, which sends
the information we need to stdout.

Signed-off-by: Peter Kjellerstedt 
---
 meta/classes/package.bbclass |  5 ++--
 meta/lib/oe/package.py   | 60 +++-
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index cc466bd1b2..65cf5fac5f 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1434,7 +1434,7 @@ if [ x"$D" = "x" ]; then
 fi
 }
 
-RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --rcfile 
${STAGING_LIBDIR_NATIVE}/rpm/rpmrc  --macros 
${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmconfigdir 
${STAGING_LIBDIR_NATIVE}/rpm/'"
+RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps"
 
 # Collect perfile run-time dependency metadata
 # Output:
@@ -1451,7 +1451,6 @@ python package_do_filedeps() {
 pkgdest = d.getVar('PKGDEST')
 packages = d.getVar('PACKAGES')
 rpmdeps = d.getVar('RPMDEPS')
-magic = d.expand("${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc")
 
 def chunks(files, n):
 return [files[i:i+n] for i in range(0, len(files), n)]
@@ -1463,7 +1462,7 @@ python package_do_filedeps() {
 if pkg.endswith('-dbg') or pkg.endswith('-doc') or 
pkg.find('-locale-') != -1 or pkg.find('-localedata-') != -1 or 
pkg.find('-gconv-') != -1 or pkg.find('-charmap-') != -1 or 
pkg.startswith('kernel-module-'):
 continue
 for files in chunks(pkgfiles[pkg], 100):
-pkglist.append((pkg, files, rpmdeps, pkgdest, magic))
+pkglist.append((pkg, files, rpmdeps, pkgdest))
 
 processed = oe.utils.multiprocess_exec( pkglist, oe.package.filedeprunner)
 
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 52c5f16cf8..4797e7d65a 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -57,44 +57,68 @@ def file_translate(file):
 def filedeprunner(arg):
 import re, subprocess, shlex
 
-(pkg, pkgfiles, rpmdeps, pkgdest, magic) = arg
+(pkg, pkgfiles, rpmdeps, pkgdest) = arg
 provides = {}
 requires = {}
 
-r = re.compile(r'[<>=]+ +[^ ]*')
+file_re = re.compile(r'\s+\d+\s(.*)')
+dep_re = re.compile(r'\s+(\S)\s+(.*)')
+r = re.compile(r'[<>=]+\s+\S*')
 
 def process_deps(pipe, pkg, pkgdest, provides, requires):
+file = None
 for line in pipe:
-f = line.decode("utf-8").split(" ", 1)[0].strip()
-line = line.decode("utf-8").split(" ", 1)[1].strip()
+line = line.decode("utf-8")
 
-if line.startswith("Requires:"):
+m = file_re.match(line)
+if m:
+file = m.group(1)
+file = file.replace(pkgdest + "/" + pkg, "")
+file = file_translate(file)
+continue
+
+m = dep_re.match(line)
+if not m or not file:
+continue
+
+type, dep = m.groups()
+
+if type == 'R':
 i = requires
-elif line.startswith("Provides:"):
+elif type == 'P':
 i = provides
 else:
-continue
+   continue
 
-file = f.replace(pkgdest + "/" + pkg, "")
-file = file_translate(file)
-value = line.split(":", 1)[1].strip()
-value = r.sub(r'(\g<0>)', value)
+if dep.startswith("python("):
+continue
 
-if value.startswith("rpmlib("):
+# Ignore all perl(VMS::...) and perl(Mac::...) dependencies. These
+# are typically used conditionally from the Perl code, but are
+# generated as 

[OE-core] [PATCHv2 00/11] More fixes for file dependency generation with RPM

[Peter Kjellerstedt]

This is the second take on restoring the file dependency support for
RPM that was lost in Pyro. These changes should fix most (all?)
problems that were seen on the autobuilders after the first set of
changes were introduced.

The first patch is not strictly needed for this, but it fixes a build
problem due to a renamed file in a patch file that I got when building
core-image-sato. No idea why no one else has had problems with this...

//Peter

The following changes since commit 2bf2ab9fcd12b179c396d2d4b4603b774a37eef6:

  bitbake: bitbake-user-manual: Updated BBLAYERS_FETCH_DIR variable description 
(2017-06-15 11:15:59 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib pkj/rpm_regressions2
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=pkj/rpm_regressions2

Peter Kjellerstedt (11):
  gtk+3: Update the patches to work without PATCHTOOL = "git"
  perl: Do not generate file dependencies for perl-ptest
  rpm: Add dependencies on bash, perl and python3-core
  linux-firmware: Avoid a dependency on python-core
  texi2html: Add a dependency on perl
  git: Add a dependency on perl for gitweb
  git: Do not install git cvsserver and git svn by default
  texinfo: Avoid a problem with a dependency on perl(Locale::gettext_xs)
  package_rpm.bbclass: Filter out unwanted file deps for nativesdk
packages
  insane.bbclass: Ignore perl as dependency for nativesdk packages
  package.bbclass: Restore functionality to detect RPM dependencies

 meta/classes/insane.bbclass|   2 +-
 meta/classes/package.bbclass   |   5 +-
 meta/classes/package_rpm.bbclass   |  25 +-
 meta/lib/oe/package.py |  60 +++--
 meta/recipes-devtools/git/git.inc  |  23 +-
 meta/recipes-devtools/perl/perl-ptest.inc  |   4 +
 meta/recipes-devtools/rpm/rpm_git.bb   |   5 +
 meta/recipes-extended/texi2html/texi2html_5.0.bb   |   2 +
 meta/recipes-extended/texinfo/texinfo_6.3.bb   |   6 +
 .../gtk+/gtk+3/0001-Hardcoded-libtool.patch|  12 +-
 ...Do-not-try-to-initialize-GL-without-libGL.patch |   8 +-
 .../0003-Add-disable-opengl-configure-option.patch | 268 +++--
 ...4-configure.ac-Fix-wayland-protocols-path.patch |   8 +-
 .../linux-firmware/linux-firmware_git.bb   |   3 +
 14 files changed, 317 insertions(+), 114 deletions(-)

-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 02/11] perl: Do not generate file dependencies for perl-ptest

[Peter Kjellerstedt]

The perl-ptest package contains Perl internal modules and generating
file dependencies for it causes problems.

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-devtools/perl/perl-ptest.inc | 4 
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-devtools/perl/perl-ptest.inc 
b/meta/recipes-devtools/perl/perl-ptest.inc
index 04406d5744..1f549af1b3 100644
--- a/meta/recipes-devtools/perl/perl-ptest.inc
+++ b/meta/recipes-devtools/perl/perl-ptest.inc
@@ -39,3 +39,7 @@ python populate_packages_prepend() {
 }
 
 RDEPENDS_${PN}-ptest += "${PN}-modules ${PN}-doc ${PN}-misc sed libssp"
+
+# The perl-ptest package contains Perl internal modules and generating file
+# dependencies for it causes problems.
+SKIP_FILEDEPS_${PN}-ptest = '1'
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work without PATCHTOOL = "git"

[Peter Kjellerstedt]

> -Original Message-
> From: Alexander Kanavin [mailto:alexander.kana...@linux.intel.com]
> Sent: den 15 juni 2017 16:24
> To: Peter Kjellerstedt ; Burton, Ross
> 
> Cc: OE-core 
> Subject: Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work
> without PATCHTOOL = "git"
> 
> On 06/15/2017 05:22 PM, Peter Kjellerstedt wrote:
> 
> >>> Well, I am pretty sure Git patches that rename files are not
> supposed
> >>> to be used, since quilt does not support this AFAIK. So the change
> in
> >>> this patch should be correct.
> >>>
> >>> However, I would be more than happy if anyone can explain why
> others
> >>> are not seeing this (or does everyone have PATCHTOOL = "git" in
> their
> >>> configurations somehow?)
> >>
> >> This is unlikely; I certainly don't. Perhaps if you provide the
> exact
> >> command that is being executed, and what is the error it prints, I
> >> could try to do the same?
> >
> > Well, I was running "bitbake core-image-sato", but "bitbake gtk+3"
> should
> > do...
> 
> What I wanted to see is the failing command (quilt, or patch, or what
> is it specifically), and the error you get. gtk+3 is patched and built
> herewith no issues at all.
> 
> Alex

It turns out the problem is only seen if opengl is enabled in 
DISTRO_FEATURES. However, since that is the default for poky, that still 
does not explain why others do not see the problem

I have included the log.do_compile file where one can see that the 
file gdkx-with-gl-context.h is missing (that is the file that was 
supposed to be renamed from gdkx.h by the patch). When I look in 
tmp/work/i586-poky-linux/gtk+3/3.22.15-r0/gtk+-3.22.15/gdk/x11 I see 
gdkx.h and gdkx-without-gl-context.h, instead of the expected 
gdkx-with-gl-context.h and gdkx-without-gl-context.h...

//Peter



gtk+3.log
Description: gtk+3.log
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCHv2] oe-pkgdata-util: package-info: Allow extra variables to be displayed

[Peter Kjellerstedt]

*ping*

//Peter

> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> Peter Kjellerstedt
> Sent: den 1 juni 2017 09:34
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCHv2] oe-pkgdata-util: package-info: Allow extra
> variables to be displayed
> 
> By specifying the -e  option one or multiple times, extra
> variables available in the pkgdata can be displayed, e.,g,
> `oe-pkgdata-util package-info -e SUMMARY -e LICENSE ...`. The extra
> variables displayed are quoted since some of them may contain
> whitespace.
> 
> Signed-off-by: Peter Kjellerstedt 
> ---
> PATCHv2: Changed references to SRC_URI into LICENSE, since SRC_URI is
> not an available variable in the pkgdata.
> 
>  scripts/oe-pkgdata-util | 11 +--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
> index 6255662a4b..87beecb9da 100755
> --- a/scripts/oe-pkgdata-util
> +++ b/scripts/oe-pkgdata-util
> @@ -325,8 +325,14 @@ def package_info(args):
>  recipe_version = recipe_version + "-" +
> mappings[pkg]['PR']
>  pkg_size = mappings[pkg]['PKGSIZE']
> 
> -items.append("%s %s %s %s %s" %
> - (pkg, pkg_version, recipe, recipe_version,
> pkg_size))
> +line = "%s %s %s %s %s" % (pkg, pkg_version, recipe,
> recipe_version, pkg_size)
> +
> +for val in args.extra:
> +src_uri = mappings[pkg][val].strip()
> +src_uri = re.sub(r'\s+', ' ', src_uri)
> +line += ' "%s"' % src_uri
> +
> +items.append(line)
>  print('\n'.join(items))
> 
>  def get_recipe_pkgs(pkgdata_dir, recipe, unpackaged):
> @@ -530,6 +536,7 @@ def main():
>description='Looks up the
> specified runtime package(s) and display information')
>  parser_package_info.add_argument('pkg', nargs='*', help='Runtime
> package name to look up')
>  parser_package_info.add_argument('-f', '--file', help='Read
> package names from the specified file (one per line, first field
> only)')
> +parser_package_info.add_argument('-e', '--extra', help='Extra
> variables to display, e.g., LICENSE (can be specified multiple times)',
> action='append')
>  parser_package_info.set_defaults(func=package_info)
> 
>  parser_find_path = subparsers.add_parser('find-path',
> --
> 2.12.0
> 
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] meta: Drop remnants of uclibc support

[Richard Purdie]

uclibc support was removed a while ago and musl works much better. Start to
remove the various overrides and patches related to uclibc which are no longer
needed.

uclibc support in a layer would still be possible. I have strong reasons to
believe nobody is still using uclibc since patches are missing and I doubt
the metadata even parses anymore.

Signed-off-by: Richard Purdie 
---
 meta/conf/distro/include/security_flags.inc|   4 -
 meta/conf/distro/include/tcmode-default.inc|   3 -
 meta/conf/local.conf.sample.extended   |   5 +-
 meta/recipes-connectivity/avahi/avahi.inc  |   5 -
 meta/recipes-connectivity/ofono/ofono_1.20.bb  |   2 -
 meta/recipes-connectivity/openssh/openssh_7.5p1.bb |   6 -
 meta/recipes-core/busybox/busybox.inc  |   2 +-
 meta/recipes-core/gettext/gettext_0.19.8.1.bb  |   8 -
 meta/recipes-core/glib-2.0/glib.inc|   1 -
 meta/recipes-core/glibc/glibc-collateral.inc   |   1 -
 meta/recipes-core/glibc/glibc-package.inc  |  16 --
 meta/recipes-core/glibc/glibc_2.25.bb  |   1 -
 .../packagegroups/packagegroup-core-sdk.bb |   1 -
 .../packagegroup-core-tools-profile.bb |  13 +-
 meta/recipes-core/systemd/systemd.inc  |   2 -
 meta/recipes-core/systemd/systemd_232.bb   |   3 -
 meta/recipes-devtools/elfutils/elfutils_0.168.bb   |   6 -
 meta/recipes-devtools/gdb/gdb-common.inc   |   1 -
 .../gnu-config/config-guess-uclibc.patch   | 170 ---
 .../gnu-config/gnu-config/uclibc.patch |  23 --
 .../gnu-config/gnu-config_20120814.bb  |   1 -
 meta/recipes-devtools/m4/m4.inc|   1 -
 meta/recipes-devtools/mtools/mtools_4.0.18.bb  |   2 -
 meta/recipes-extended/diffutils/diffutils.inc  |   7 -
 meta/recipes-extended/findutils/findutils.inc  |   7 -
 meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb   |   3 -
 .../net-tools/net-tools_1.60-26.bb |   2 -
 meta/recipes-extended/pam/libpam/use-utmpx.patch   | 233 -
 meta/recipes-extended/pam/libpam_1.3.0.bb  |   2 -
 meta/recipes-extended/parted/parted_3.2.bb |   1 -
 meta/recipes-extended/shadow/shadow.inc|   1 -
 meta/recipes-extended/sysstat/sysstat.inc  |   1 -
 .../tcp-wrappers/tcp-wrappers_7.6.bb   |   1 -
 meta/recipes-gnome/gnome/gconf_3.2.6.bb|   3 +-
 meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb   |   2 -
 meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb   |   6 -
 .../packagegroups/packagegroup-core-x11-sato.bb|   1 -
 meta/recipes-support/attr/ea-acl.inc   |   3 -
 meta/recipes-support/gnutls/gnutls.inc |   1 -
 meta/recipes-support/icu/icu.inc   |   2 -
 meta/recipes-support/liburcu/liburcu_0.9.3.bb  |   1 -
 .../rng-tools/uclibc-libuargp-configure.patch  |  63 --
 meta/recipes-support/rng-tools/rng-tools_5.bb  |   3 -
 43 files changed, 5 insertions(+), 615 deletions(-)
 delete mode 100644 
meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
 delete mode 100644 meta/recipes-devtools/gnu-config/gnu-config/uclibc.patch
 delete mode 100644 meta/recipes-extended/pam/libpam/use-utmpx.patch
 delete mode 100644 
meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch

diff --git a/meta/conf/distro/include/security_flags.inc 
b/meta/conf/distro/include/security_flags.inc
index e162abe..38164d0 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -84,8 +84,6 @@ SECURITY_CFLAGS_pn-slang = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-source-highlight = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}"
-SECURITY_CFLAGS_pn-uclibc = ""
-SECURITY_CFLAGS_pn-uclibc-initial = ""
 SECURITY_CFLAGS_pn-valgrind = ""
 SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}"
 
@@ -100,8 +98,6 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}"
 SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong"
 SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong"
 SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong"
-SECURITY_LDFLAGS_remove_pn-uclibc = "-fstack-protector-strong"
-SECURITY_LDFLAGS_remove_pn-uclibc-initial = "-fstack-protector-strong"
 SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}"
 SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}"
 SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}"
diff --git a/meta/conf/distro/include/tcmode-default.inc 
b/meta/conf/distro/include/tcmode-default.inc
index d5ba38d..424b888 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -27,7 +27,6 @@ SDKGCCVERSION ?= "${GCCVERSION}"
 BINUVERSION ?= "2.28%"
 

Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work without PATCHTOOL = "git"

[Gary Thomas]

On 2017-06-15 16:18, Alexander Kanavin wrote:

On 06/15/2017 05:11 PM, Peter Kjellerstedt wrote:


My apologies, but I do not think this is a satisfactory answer: it may
mean you are fixing the wrong problem, or a problem that does not
exist.

Alex


Well, I am pretty sure Git patches that rename files are not supposed
to be used, since quilt does not support this AFAIK. So the change in
this patch should be correct.

However, I would be more than happy if anyone can explain why others
are not seeing this (or does everyone have PATCHTOOL = "git" in their
configurations somehow?)


This is unlikely; I certainly don't. Perhaps if you provide the exact command that is being executed, and what is the 
error it prints, I could try to do the same?

By default (i.e. nothing special in my local.conf), I have
  PATCHTOOL = "quilt"

--

Gary Thomas |  Consulting for the
MLB Associates  |Embedded world

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work without PATCHTOOL = "git"

[Alexander Kanavin]

On 06/15/2017 05:22 PM, Peter Kjellerstedt wrote:


Well, I am pretty sure Git patches that rename files are not supposed
to be used, since quilt does not support this AFAIK. So the change in
this patch should be correct.

However, I would be more than happy if anyone can explain why others
are not seeing this (or does everyone have PATCHTOOL = "git" in their
configurations somehow?)


This is unlikely; I certainly don't. Perhaps if you provide the exact
command that is being executed, and what is the error it prints, I
could try to do the same?


Well, I was running "bitbake core-image-sato", but "bitbake gtk+3" should
do...


What I wanted to see is the failing command (quilt, or patch, or what is 
it specifically), and the error you get. gtk+3 is patched and built here 
with no issues at all.



Alex


--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work without PATCHTOOL = "git"

[Peter Kjellerstedt]

> -Original Message-
> From: Alexander Kanavin [mailto:alexander.kana...@linux.intel.com]
> Sent: den 15 juni 2017 16:19
> To: Peter Kjellerstedt ; Burton, Ross
> 
> Cc: OE-core 
> Subject: Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work
> without PATCHTOOL = "git"
> 
> On 06/15/2017 05:11 PM, Peter Kjellerstedt wrote:
> 
> >> My apologies, but I do not think this is a satisfactory answer: it
> >> may mean you are fixing the wrong problem, or a problem that does 
> >> not exist.
> >>
> >> Alex
> >
> > Well, I am pretty sure Git patches that rename files are not supposed
> > to be used, since quilt does not support this AFAIK. So the change in
> > this patch should be correct.
> >
> > However, I would be more than happy if anyone can explain why others
> > are not seeing this (or does everyone have PATCHTOOL = "git" in their
> > configurations somehow?)
> 
> This is unlikely; I certainly don't. Perhaps if you provide the exact
> command that is being executed, and what is the error it prints, I
> could try to do the same?

Well, I was running "bitbake core-image-sato", but "bitbake gtk+3" should 
do...

> Alex

//Peter

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work without PATCHTOOL = "git"

[Alexander Kanavin]

On 06/15/2017 05:11 PM, Peter Kjellerstedt wrote:


My apologies, but I do not think this is a satisfactory answer: it may
mean you are fixing the wrong problem, or a problem that does not
exist.

Alex


Well, I am pretty sure Git patches that rename files are not supposed
to be used, since quilt does not support this AFAIK. So the change in
this patch should be correct.

However, I would be more than happy if anyone can explain why others
are not seeing this (or does everyone have PATCHTOOL = "git" in their
configurations somehow?)


This is unlikely; I certainly don't. Perhaps if you provide the exact 
command that is being executed, and what is the error it prints, I could 
try to do the same?


Alex

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 11/11] package.bbclass: Restore functionality to detect RPM dependencies

[Peter Kjellerstedt]

> -Original Message-
> From: Alexander Kanavin [mailto:alexander.kana...@linux.intel.com]
> Sent: den 15 juni 2017 16:03
> To: Peter Kjellerstedt ; openembedded-
> c...@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 11/11] package.bbclass: Restore
> functionality to detect RPM dependencies
> 
> On 06/15/2017 04:53 PM, Peter Kjellerstedt wrote:
> > During the transition to dnf and rpm4, the functionality to
> > automatically make RPM determine dependencies was lost.
> >
> > Before the transition, an OE specific tool called rpmdeps-oecore had
> > been added to the rpm suit. It was based on the rpmdeps tool that is
> > part of rpm. For each file specified on its command line, it would
> > output the provides and requires that RPM could determine.
> >
> > During the transition to rpm4, rpmdeps-oecore was replaced with the
> > standard rpmdeps. However, what no one noticed was that unless
> rpmdeps
> > is given options, e.g., -P or -R, to tell it what it should output,
> it
> > will not output anything. Thus, it would do all the work to determine
> > the requirements, but would keep silent about it. And since no output
> > from rpmdeps is expected unless there are requirements, there were no
> > warnings indicating that everything was not working as expected.
> >
> > Porting the old rpmdeps-oecore to work with rpm4 is not really
> > possible since it relied on being able to access internals of RPM
> that
> > are no longer available. However, it turned out that rpmdeps had a
> > debug option, --rpmfcdebug, that would output exactly the information
> > that we need, albeit in a different format and to stderr. To make
> this
> > usable, rpmdeps has now received a new option, --alldeps, which sends
> > the information we need to stdout.
> 
> I'd like you to address my previous comment: how do you ensure this will
> continue to work going forward? Is it taken into use by default, and if
> it breaks, will we notice?
> 
> Alex

Yes, once the last commit that changes package.bbclass is integrated, it 
will be activated for all builds that use RPM. And given how red the 
autobuilders got when RP did it the first time, I do not think there is 
any chance we will miss problems due to it...

I do agree that some kind of tests for this would probably be good. 
However, I do not have any experience with the oe-selftests, and how to 
implement some tests for this, and I am pressed for time as I go on 
summer vacation next Friday and would very much like for this to be 
fixed before then. Especially as we need these changes to make it into 
Pyro as well...

//Peter

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 07/11] git: Do not install git cvsserver and git svn

[Peter Kjellerstedt]

Well, I guess I can do that…

//Peter

From: Burton, Ross [mailto:ross.bur...@intel.com]
Sent: den 15 juni 2017 16:01
To: Peter Kjellerstedt 
Cc: OE-core 
Subject: Re: [OE-core] [PATCH 07/11] git: Do not install git cvsserver and git 
svn


On 15 June 2017 at 14:59, Burton, Ross 
> wrote:
Is this a good reason to remove the binaries though?  What if someone added the 
modules and wanted to use these binaries?

Oh, the new filedeps logic will add module-level dependencies.

Maybe PACKAGECONFIG these?

Ross

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work without PATCHTOOL = "git"

[Peter Kjellerstedt]

> -Original Message-
> From: Alexander Kanavin [mailto:alexander.kana...@linux.intel.com]
> Sent: den 15 juni 2017 16:06
> To: Peter Kjellerstedt ; Burton, Ross
> 
> Cc: OE-core 
> Subject: Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work
> without PATCHTOOL = "git"
> 
> On 06/15/2017 05:00 PM, Peter Kjellerstedt wrote:
> > I have absolutely no idea...
> 
> My apologies, but I do not think this is a satisfactory answer: it may
> mean you are fixing the wrong problem, or a problem that does not
> exist.
> 
> Alex

Well, I am pretty sure Git patches that rename files are not supposed 
to be used, since quilt does not support this AFAIK. So the change in 
this patch should be correct.

However, I would be more than happy if anyone can explain why others 
are not seeing this (or does everyone have PATCHTOOL = "git" in their 
configurations somehow?)

//Peter

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 09/11] package_rpm.bbclass: Filter out unwanted file deps for nativesdk packages

[Peter Kjellerstedt]

> -Original Message-
> From: Alexander Kanavin [mailto:alexander.kana...@linux.intel.com]
> Sent: den 15 juni 2017 16:00
> To: Peter Kjellerstedt ; openembedded-
> c...@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 09/11] package_rpm.bbclass: Filter out
> unwanted file deps for nativesdk packages
> 
> On 06/15/2017 04:53 PM, Peter Kjellerstedt wrote:
> > Filter out any file dependencies on absolute paths and any
> > dependencies on Perl modules for nativesdk packages. It is assumed
> > that they will be provided by the native host if needed, and they
> mess
> > up the dependency handling if they are present.
> 
> Does this mean you can also drop the "bin/sh" hack from here in the
> same
> file?
> 
>  print_deps(srcrprovides + (" /bin/sh" if
> srcname.startswith("nativesdk-") else ""), "Provides",
> spec_preamble_top, d)
> 
> 
> Alex

No, unfortunately not. I tried it, but it turns out rpm adds the 
dependency itself even if it is not specified in the .spec file 
due to the postinst scriptlet.

//Peter

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work without PATCHTOOL = "git"

[Alexander Kanavin]

On 06/15/2017 05:00 PM, Peter Kjellerstedt wrote:

I have absolutely no idea…


My apologies, but I do not think this is a satisfactory answer: it may 
mean you are fixing the wrong problem, or a problem that does not exist.



Alex

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 11/11] package.bbclass: Restore functionality to detect RPM dependencies

[Alexander Kanavin]

On 06/15/2017 04:53 PM, Peter Kjellerstedt wrote:

During the transition to dnf and rpm4, the functionality to
automatically make RPM determine dependencies was lost.

Before the transition, an OE specific tool called rpmdeps-oecore had
been added to the rpm suit. It was based on the rpmdeps tool that is
part of rpm. For each file specified on its command line, it would
output the provides and requires that RPM could determine.

During the transition to rpm4, rpmdeps-oecore was replaced with the
standard rpmdeps. However, what no one noticed was that unless rpmdeps
is given options, e.g., -P or -R, to tell it what it should output, it
will not output anything. Thus, it would do all the work to determine
the requirements, but would keep silent about it. And since no output
from rpmdeps is expected unless there are requirements, there were no
warnings indicating that everything was not working as expected.

Porting the old rpmdeps-oecore to work with rpm4 is not really
possible since it relied on being able to access internals of RPM that
are no longer available. However, it turned out that rpmdeps had a
debug option, --rpmfcdebug, that would output exactly the information
that we need, albeit in a different format and to stderr. To make this
usable, rpmdeps has now received a new option, --alldeps, which sends
the information we need to stdout.


I'd like you to address my previous comment: how do you ensure this will 
continue to work going forward? Is it taken into use by default, and if 
it breaks, will we notice?


Alex

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 07/11] git: Do not install git cvsserver and git svn

[Burton, Ross]

On 15 June 2017 at 14:59, Burton, Ross  wrote:

> Is this a good reason to remove the binaries though?  What if someone
> added the modules and wanted to use these binaries?
>

Oh, the new filedeps logic will add module-level dependencies.

Maybe PACKAGECONFIG these?

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 09/11] package_rpm.bbclass: Filter out unwanted file deps for nativesdk packages

[Alexander Kanavin]

On 06/15/2017 04:53 PM, Peter Kjellerstedt wrote:

Filter out any file dependencies on absolute paths and any
dependencies on Perl modules for nativesdk packages. It is assumed
that they will be provided by the native host if needed, and they mess
up the dependency handling if they are present.


Does this mean you can also drop the "bin/sh" hack from here in the same 
file?


print_deps(srcrprovides + (" /bin/sh" if 
srcname.startswith("nativesdk-") else ""), "Provides", spec_preamble_top, d)



Alex

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work without PATCHTOOL = "git"

[Peter Kjellerstedt]

I have absolutely no idea…

//Peter

From: Burton, Ross [mailto:ross.bur...@intel.com]
Sent: den 15 juni 2017 15:58
To: Peter Kjellerstedt 
Cc: OE-core 
Subject: Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work without 
PATCHTOOL = "git"


On 15 June 2017 at 14:53, Peter Kjellerstedt 
> wrote:
The patch "0003-Add-disable-opengl-configure-option.patch" used Git
rename syntax, which is not supported by quilt.

But quilt is the default, so how did this ever work?

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 07/11] git: Do not install git cvsserver and git svn

[Burton, Ross]

On 15 June 2017 at 14:53, Peter Kjellerstedt 
wrote:

> These git commands require Perl modules that do not exist in OE-Core.
>

Is this a good reason to remove the binaries though?  What if someone added
the modules and wanted to use these binaries?

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 01/11] gtk+3: Update the patches to work without PATCHTOOL = "git"

[Burton, Ross]

On 15 June 2017 at 14:53, Peter Kjellerstedt 
wrote:

> The patch "0003-Add-disable-opengl-configure-option.patch" used Git
> rename syntax, which is not supported by quilt.
>

But quilt is the default, so how did this ever work?

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 07/11] git: Do not install git cvsserver and git svn

[Peter Kjellerstedt]

These git commands require Perl modules that do not exist in OE-Core.

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-devtools/git/git.inc | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/git/git.inc 
b/meta/recipes-devtools/git/git.inc
index 9b0d328bad..3ce4642ae7 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -54,6 +54,17 @@ perl_native_fixup () {
mkdir -p ${D}${libdir}
mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir}
rmdir -p ${D}${exec_prefix}/lib/perl-native || true
+
+   # Remove git cvsserver as it requires the DBI Perl module, which does
+   # not exist in OE-Core.
+   rm ${D}${libexecdir}/git-core/git-cvsserver \
+  ${D}${bindir}/git-cvsserver
+
+   # Remove git svn and all Git::SVN Perl modules as they require the
+   # SVN::Core Perl module, which does not exist in OE-Core.
+   rm -r ${D}${libexecdir}/git-core/git-svn \
+ ${D}${libdir}/perl/site_perl/*/Git/SVN*
+   sed -i -e '/SVN/d' ${D}${libdir}/perl/site_perl/*/auto/Git/.packlist
 }
 
 REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core"
@@ -83,12 +94,9 @@ PERLTOOLS = " \
 ${libexecdir}/git-core/git-archimport \
 ${libexecdir}/git-core/git-cvsexportcommit \
 ${libexecdir}/git-core/git-cvsimport \
-${libexecdir}/git-core/git-cvsserver \
-${bindir}/git-cvsserver \
 ${libexecdir}/git-core/git-difftool \
 ${libexecdir}/git-core/git-relink \
 ${libexecdir}/git-core/git-send-email \
-${libexecdir}/git-core/git-svn \
 ${libexecdir}/git-core/git-instaweb \
 ${libexecdir}/git-core/git-submodule \
 ${libexecdir}/git-core/git-am \
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 03/11] rpm: Add dependencies on bash, perl and python3-core

[Peter Kjellerstedt]

Also modify a Python script (pythondistdeps.py) to use Python 3.

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-devtools/rpm/rpm_git.bb | 5 +
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-devtools/rpm/rpm_git.bb 
b/meta/recipes-devtools/rpm/rpm_git.bb
index 2a0dcafac7..30702a7507 100644
--- a/meta/recipes-devtools/rpm/rpm_git.bb
+++ b/meta/recipes-devtools/rpm/rpm_git.bb
@@ -103,6 +103,9 @@ do_install_append_class-target() {
 
 do_install_append () {
sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}/${libdir}/rpm/macros
+
+   sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \
+   ${D}${libdir}/rpm/pythondistdeps.py
 }
 
 FILES_${PN} += "${libdir}/rpm-plugins/*.so \
@@ -117,3 +120,5 @@ FILES_python3-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm/*"
 
 # rpm 5.x was packaging the rpm build tools separately
 RPROVIDES_${PN} += "rpm-build"
+
+RDEPENDS_${PN} = "bash perl python3-core"
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 09/11] package_rpm.bbclass: Filter out unwanted file deps for nativesdk packages

[Peter Kjellerstedt]

Filter out any file dependencies on absolute paths and any
dependencies on Perl modules for nativesdk packages. It is assumed
that they will be provided by the native host if needed, and they mess
up the dependency handling if they are present.

Signed-off-by: Peter Kjellerstedt 
---
 meta/classes/package_rpm.bbclass | 25 +++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index dc241975c3..5f29b45180 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -7,10 +7,28 @@ RPMBUILD="rpmbuild"
 
 PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms"
 
-# Maintaining the perfile dependencies has singificant overhead when writing 
the 
+# Maintaining the perfile dependencies has singificant overhead when writing 
the
 # packages. When set, this value merges them for efficiency.
 MERGEPERFILEDEPS = "1"
 
+# Filter dependencies based on a provided function.
+def filter_deps(var, f):
+import collections
+
+depends_dict = bb.utils.explode_dep_versions2(var)
+newdeps_dict = collections.OrderedDict()
+for dep in depends_dict:
+if f(dep):
+newdeps_dict[dep] = depends_dict[dep]
+return bb.utils.join_deps(newdeps_dict, commasep=False)
+
+# Filter out absolute paths (typically /bin/sh and /usr/bin/env) and any perl
+# dependencies for nativesdk packages.
+def filter_nativesdk_deps(srcname, var):
+if var and srcname.startswith("nativesdk-"):
+var = filter_deps(var, lambda dep: not dep.startswith('/') and dep != 
'perl' and not dep.startswith('perl('))
+return var
+
 # Construct per file dependencies file
 def write_rpm_perfiledata(srcname, d):
 workdir = d.getVar('WORKDIR')
@@ -26,7 +44,8 @@ def write_rpm_perfiledata(srcname, d):
 dependsflist = (d.getVar(dependsflist_key) or "")
 for dfile in dependsflist.split():
 key = "FILE" + varname + "_" + dfile + "_" + pkg
-depends_dict = bb.utils.explode_dep_versions(d.getVar(key) or 
"")
+deps = filter_nativesdk_deps(srcname, d.getVar(key) or "")
+depends_dict = bb.utils.explode_dep_versions(deps)
 file = dfile.replace("@underscore@", "_")
 file = file.replace("@closebrace@", "]")
 file = file.replace("@openbrace@", "[")
@@ -359,6 +378,8 @@ python write_specfile () {
 splitrdepends = splitrdepends + " " + get_perfile('RDEPENDS', pkg, 
d)
 splitrprovides = splitrprovides + " " + get_perfile('RPROVIDES', 
pkg, d)
 
+splitrdepends = filter_nativesdk_deps(srcname, splitrdepends)
+
 # Gather special src/first package data
 if srcname == splitname:
 srcrdepends= splitrdepends
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 10/11] insane.bbclass: Ignore perl as dependency for nativesdk packages

[Peter Kjellerstedt]

Signed-off-by: Peter Kjellerstedt 
---
 meta/classes/insane.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index f6fd7c74d8..d57b98e04c 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -906,7 +906,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, 
packages, d):
 if "file-rdeps" not in skip:
 ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 
'rtld(GNU_HASH)'])
 if bb.data.inherits_class('nativesdk', d):
-ignored_file_rdeps |= set(['/bin/bash', '/usr/bin/perl'])
+ignored_file_rdeps |= set(['/bin/bash', '/usr/bin/perl', 
'perl'])
 # For Saving the FILERDEPENDS
 filerdepends = {}
 rdep_data = oe.packagedata.read_subpkgdata(pkg, d)
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 00/11] More fixes for file dependency generation with RPM

[Peter Kjellerstedt]

This is the second take on restoring the file dependency support for
RPM that was lost in Pyro. These changes should fix most (all?)
problems that were seen on the autobuilders after the first set of
changes were introduced.

The first patch is not strictly needed for this, but it fixes a build
problem due to a renamed file in a patch file that I got when building
core-image-sato. No idea why no one else has had problems with this...

//Peter

The following changes since commit 2bf2ab9fcd12b179c396d2d4b4603b774a37eef6:

  bitbake: bitbake-user-manual: Updated BBLAYERS_FETCH_DIR variable description 
(2017-06-15 11:15:59 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib pkj/rpm_regressions2
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=pkj/rpm_regressions2

Peter Kjellerstedt (11):
  gtk+3: Update the patches to work without PATCHTOOL = "git"
  perl: Do not generate file dependencies for perl-ptest
  rpm: Add dependencies on bash, perl and python3-core
  linux-firmware: Avoid a dependency on python-core
  texi2html: Add a dependency on perl
  git: Add a dependency on perl for gitweb
  git: Do not install git cvsserver and git svn
  texinfo: Avoid a problem with a dependency on perl(Locale::gettext_xs)
  package_rpm.bbclass: Filter out unwanted file deps for nativesdk
packages
  insane.bbclass: Ignore perl as dependency for nativesdk packages
  package.bbclass: Restore functionality to detect RPM dependencies

 meta/classes/insane.bbclass|   2 +-
 meta/classes/package.bbclass   |   5 +-
 meta/classes/package_rpm.bbclass   |  25 +-
 meta/lib/oe/package.py |  60 +++--
 meta/recipes-devtools/git/git.inc  |  16 +-
 meta/recipes-devtools/perl/perl-ptest.inc  |   4 +
 meta/recipes-devtools/rpm/rpm_git.bb   |   5 +
 meta/recipes-extended/texi2html/texi2html_5.0.bb   |   2 +
 meta/recipes-extended/texinfo/texinfo_6.3.bb   |   6 +
 .../gtk+/gtk+3/0001-Hardcoded-libtool.patch|  12 +-
 ...Do-not-try-to-initialize-GL-without-libGL.patch |   8 +-
 .../0003-Add-disable-opengl-configure-option.patch | 268 +++--
 ...4-configure.ac-Fix-wayland-protocols-path.patch |   8 +-
 .../linux-firmware/linux-firmware_git.bb   |   3 +
 14 files changed, 307 insertions(+), 117 deletions(-)

-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 11/11] package.bbclass: Restore functionality to detect RPM dependencies

[Peter Kjellerstedt]

During the transition to dnf and rpm4, the functionality to
automatically make RPM determine dependencies was lost.

Before the transition, an OE specific tool called rpmdeps-oecore had
been added to the rpm suit. It was based on the rpmdeps tool that is
part of rpm. For each file specified on its command line, it would
output the provides and requires that RPM could determine.

During the transition to rpm4, rpmdeps-oecore was replaced with the
standard rpmdeps. However, what no one noticed was that unless rpmdeps
is given options, e.g., -P or -R, to tell it what it should output, it
will not output anything. Thus, it would do all the work to determine
the requirements, but would keep silent about it. And since no output
from rpmdeps is expected unless there are requirements, there were no
warnings indicating that everything was not working as expected.

Porting the old rpmdeps-oecore to work with rpm4 is not really
possible since it relied on being able to access internals of RPM that
are no longer available. However, it turned out that rpmdeps had a
debug option, --rpmfcdebug, that would output exactly the information
that we need, albeit in a different format and to stderr. To make this
usable, rpmdeps has now received a new option, --alldeps, which sends
the information we need to stdout.

Signed-off-by: Peter Kjellerstedt 
---
 meta/classes/package.bbclass |  5 ++--
 meta/lib/oe/package.py   | 60 +++-
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index cc466bd1b2..65cf5fac5f 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1434,7 +1434,7 @@ if [ x"$D" = "x" ]; then
 fi
 }
 
-RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --rcfile 
${STAGING_LIBDIR_NATIVE}/rpm/rpmrc  --macros 
${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmconfigdir 
${STAGING_LIBDIR_NATIVE}/rpm/'"
+RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps"
 
 # Collect perfile run-time dependency metadata
 # Output:
@@ -1451,7 +1451,6 @@ python package_do_filedeps() {
 pkgdest = d.getVar('PKGDEST')
 packages = d.getVar('PACKAGES')
 rpmdeps = d.getVar('RPMDEPS')
-magic = d.expand("${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc")
 
 def chunks(files, n):
 return [files[i:i+n] for i in range(0, len(files), n)]
@@ -1463,7 +1462,7 @@ python package_do_filedeps() {
 if pkg.endswith('-dbg') or pkg.endswith('-doc') or 
pkg.find('-locale-') != -1 or pkg.find('-localedata-') != -1 or 
pkg.find('-gconv-') != -1 or pkg.find('-charmap-') != -1 or 
pkg.startswith('kernel-module-'):
 continue
 for files in chunks(pkgfiles[pkg], 100):
-pkglist.append((pkg, files, rpmdeps, pkgdest, magic))
+pkglist.append((pkg, files, rpmdeps, pkgdest))
 
 processed = oe.utils.multiprocess_exec( pkglist, oe.package.filedeprunner)
 
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 52c5f16cf8..4797e7d65a 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -57,44 +57,68 @@ def file_translate(file):
 def filedeprunner(arg):
 import re, subprocess, shlex
 
-(pkg, pkgfiles, rpmdeps, pkgdest, magic) = arg
+(pkg, pkgfiles, rpmdeps, pkgdest) = arg
 provides = {}
 requires = {}
 
-r = re.compile(r'[<>=]+ +[^ ]*')
+file_re = re.compile(r'\s+\d+\s(.*)')
+dep_re = re.compile(r'\s+(\S)\s+(.*)')
+r = re.compile(r'[<>=]+\s+\S*')
 
 def process_deps(pipe, pkg, pkgdest, provides, requires):
+file = None
 for line in pipe:
-f = line.decode("utf-8").split(" ", 1)[0].strip()
-line = line.decode("utf-8").split(" ", 1)[1].strip()
+line = line.decode("utf-8")
 
-if line.startswith("Requires:"):
+m = file_re.match(line)
+if m:
+file = m.group(1)
+file = file.replace(pkgdest + "/" + pkg, "")
+file = file_translate(file)
+continue
+
+m = dep_re.match(line)
+if not m or not file:
+continue
+
+type, dep = m.groups()
+
+if type == 'R':
 i = requires
-elif line.startswith("Provides:"):
+elif type == 'P':
 i = provides
 else:
-continue
+   continue
 
-file = f.replace(pkgdest + "/" + pkg, "")
-file = file_translate(file)
-value = line.split(":", 1)[1].strip()
-value = r.sub(r'(\g<0>)', value)
+if dep.startswith("python("):
+continue
 
-if value.startswith("rpmlib("):
+# Ignore all perl(VMS::...) and perl(Mac::...) dependencies. These
+# are typically used conditionally from the Perl code, but are
+# generated as 

[OE-core] [PATCH 08/11] texinfo: Avoid a problem with a dependency on perl(Locale::gettext_xs)

[Peter Kjellerstedt]

We do not build the Locale::gettext_xs Perl module and the code will
test for it and happily use Locale::gettext_pp instead if it is not
found. However, this still causes a file dependency on
perl(Locale::gettext_xs) to be generated, which must be satisfied by
adding an explicit provide for it.

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-extended/texinfo/texinfo_6.3.bb | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-extended/texinfo/texinfo_6.3.bb 
b/meta/recipes-extended/texinfo/texinfo_6.3.bb
index d82731e11e..f58df928aa 100644
--- a/meta/recipes-extended/texinfo/texinfo_6.3.bb
+++ b/meta/recipes-extended/texinfo/texinfo_6.3.bb
@@ -79,4 +79,10 @@ FILES_${PN}-doc = "${infodir}/texinfo* \
${datadir}/${tex_texinfo} \
${mandir}/man1 ${mandir}/man5"
 
+# Lie about providing the Locale::gettext_xs module. It is not actually built,
+# but the code will test for it and if not found use Locale::gettext_pp 
instead.
+# However, this causes a file dependency on perl(Locale::gettext_xs) to be
+# generated, which must be satisfied.
+RPROVIDES_${PN} += "perl(Locale::gettext_xs)"
+
 BBCLASSEXTEND = "native nativesdk"
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 01/11] gtk+3: Update the patches to work without PATCHTOOL = "git"

[Peter Kjellerstedt]

The patch "0003-Add-disable-opengl-configure-option.patch" used Git
rename syntax, which is not supported by quilt.

Signed-off-by: Peter Kjellerstedt 
---
 .../gtk+/gtk+3/0001-Hardcoded-libtool.patch|  12 +-
 ...Do-not-try-to-initialize-GL-without-libGL.patch |   8 +-
 .../0003-Add-disable-opengl-configure-option.patch | 268 +++--
 ...4-configure.ac-Fix-wayland-protocols-path.patch |   8 +-
 4 files changed, 207 insertions(+), 89 deletions(-)

diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch 
b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch
index 0bda1f1074..c210bbc7d5 100644
--- a/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch
@@ -1,4 +1,4 @@
-From 5a73a5b92566e314bbc8a1bd40f1ec204837c111 Mon Sep 17 00:00:00 2001
+From 0ecaa5bab162abf0cb2057d77beeb7b89d5873b4 Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen 
 Date: Tue, 21 Jun 2016 14:53:56 +0300
 Subject: [PATCH 1/4] Hardcoded libtool
@@ -12,10 +12,10 @@ Signed-off-by: Jussi Kukkonen 
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 23d3077..b6931d6 100644
+index 6628e21..f43ac09 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -610,7 +610,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc 
files])
+@@ -617,7 +617,7 @@ AC_MSG_CHECKING([whether to write dependencies into .pc 
files])
  case $enable_explicit_deps in
auto)
  export SED
@@ -24,7 +24,7 @@ index 23d3077..b6931d6 100644
  if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = 
xyes ; then
enable_explicit_deps=yes
  else
-@@ -876,7 +876,7 @@ else
+@@ -895,7 +895,7 @@ else
  dnl Now we check to see if our libtool supports shared lib deps
  dnl (in a rather ugly way even)
  if $dynworks; then
@@ -33,7 +33,7 @@ index 23d3077..b6931d6 100644
  module_deplibs_check=`$module_libtool_config | \
  grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
  sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-@@ -1630,7 +1630,7 @@ AC_SUBST(GTK_PRINT_BACKENDS)
+@@ -1649,7 +1649,7 @@ AC_SUBST(GTK_PRINT_BACKENDS)
  # We are using gmodule-no-export now, but I'm leaving the stripping
  # code in place for now, since pango and atk still require gmodule.
  export SED
@@ -43,5 +43,5 @@ index 23d3077..b6931d6 100644
GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
 -- 
-2.1.4
+2.12.0
 
diff --git 
a/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
 
b/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
index 989716e513..ab7b659414 100644
--- 
a/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
+++ 
b/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
@@ -1,4 +1,4 @@
-From d63b926f8c8d8b5c9f9ec33d078b775f0409d88a Mon Sep 17 00:00:00 2001
+From 2d2361f24be1e51201063dbbda570debe8702b6f Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen 
 Date: Fri, 16 Oct 2015 16:35:16 +0300
 Subject: [PATCH 2/4] Do not try to initialize GL without libGL
@@ -21,10 +21,10 @@ Signed-off-by: Jussi Kukkonen 
  2 files changed, 12 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index b6931d6..e27da49 100644
+index f43ac09..965eec9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -342,6 +342,13 @@ AC_ARG_ENABLE(mir-backend,
+@@ -346,6 +346,13 @@ AC_ARG_ENABLE(mir-backend,
[enable the Mir gdk backend])],
  [backend_set=yes])
  
@@ -56,5 +56,5 @@ index 81479d8..3c8c5c0 100644
  
  gint
 -- 
-2.1.4
+2.12.0
 
diff --git 
a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch 
b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
index e6ee21b64f..eaf6aec2aa 100644
--- 
a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
+++ 
b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
@@ -1,7 +1,7 @@
-From cdfd6216ac49fc7622d563d671a5b6511492827d Mon Sep 17 00:00:00 2001
+From a2e6b7cbbd6d741fed38d91b3742aa4a08395aba Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen 
 Date: Tue, 21 Jun 2016 15:11:39 +0300
-Subject: [PATCH] Add --disable-opengl configure option
+Subject: [PATCH 3/4] Add --disable-opengl configure option
 
 --disable-opengl will remove the dependency on libepoxy and on the
 OpenGL APIs. This is useful for those who want to keep using gtk+3
@@ -20,32 +20,34 @@ as it actually will depend on OpenGL.
 Upstream-Status: Inappropriate [Evil eye expected from upstream]
 Signed-off-by: Jussi Kukkonen 
 ---
- 

[OE-core] [PATCH 05/11] texi2html: Add a dependency on perl

[Peter Kjellerstedt]

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-extended/texi2html/texi2html_5.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-extended/texi2html/texi2html_5.0.bb 
b/meta/recipes-extended/texi2html/texi2html_5.0.bb
index ae64816f82..afd125b08f 100644
--- a/meta/recipes-extended/texi2html/texi2html_5.0.bb
+++ b/meta/recipes-extended/texi2html/texi2html_5.0.bb
@@ -27,3 +27,5 @@ do_install_append () {
 }
 
 FILES_${PN}-doc += "${datadir}/texinfo"
+
+RDEPENDS_${PN} = "perl"
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 04/11] linux-firmware: Avoid a dependency on python-core

[Peter Kjellerstedt]

Remove the check_whence.py script since it is only needed to validate
the WHENCE file, and only if explicitly running `make check`.

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb 
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 4558dafdac..53089f2767 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -210,6 +210,9 @@ do_install() {
# Remove pointless bash script
rm ${D}${nonarch_base_libdir}/firmware/configure
 
+   # Remove python script used to check the WHENCE file
+   rm ${D}${nonarch_base_libdir}/firmware/check_whence.py
+
# Libertas sd8686
ln -sf libertas/sd8686_v9.bin 
${D}${nonarch_base_libdir}/firmware/sd8686.bin
ln -sf libertas/sd8686_v9_helper.bin 
${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 02/11] perl: Do not generate file dependencies for perl-ptest

[Peter Kjellerstedt]

The perl-ptest package contains Perl internal modules and generating
file dependencies for it causes problems.

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-devtools/perl/perl-ptest.inc | 4 
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-devtools/perl/perl-ptest.inc 
b/meta/recipes-devtools/perl/perl-ptest.inc
index 04406d5744..1f549af1b3 100644
--- a/meta/recipes-devtools/perl/perl-ptest.inc
+++ b/meta/recipes-devtools/perl/perl-ptest.inc
@@ -39,3 +39,7 @@ python populate_packages_prepend() {
 }
 
 RDEPENDS_${PN}-ptest += "${PN}-modules ${PN}-doc ${PN}-misc sed libssp"
+
+# The perl-ptest package contains Perl internal modules and generating file
+# dependencies for it causes problems.
+SKIP_FILEDEPS_${PN}-ptest = '1'
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 06/11] git: Add a dependency on perl for gitweb

[Peter Kjellerstedt]

Signed-off-by: Peter Kjellerstedt 
---
 meta/recipes-devtools/git/git.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/git/git.inc 
b/meta/recipes-devtools/git/git.inc
index ade99ecfe0..9b0d328bad 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -118,6 +118,6 @@ FILES_${PN}-tk = " \
 
 PACKAGES =+ "gitweb"
 FILES_gitweb = "${datadir}/gitweb/"
-
+RDEPENDS_gitweb = "perl"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [yocto-security][PATCH] package_ipk: Remove Source entry from ipk packages

[Andrej Valek]

There is the potential for sensitive information to leak through the urls
there and removing it brings this into the behavior of the other package
backends since filtering it is likely error prone.

Signed-off-by: Andrej Valek 
---
 meta/classes/package_ipk.bbclass | 4 
 1 file changed, 4 deletions(-)

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index d2ce3b3..2a291b0 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -205,10 +205,6 @@ def ipk_write_pkg(pkg, d):
 ctrlfile.write("Replaces: %s\n" % bb.utils.join_deps(rreplaces))
 if rconflicts:
 ctrlfile.write("Conflicts: %s\n" % bb.utils.join_deps(rconflicts))
-src_uri = localdata.getVar("SRC_URI").strip() or "None"
-if src_uri:
-src_uri = re.sub("\s+", " ", src_uri)
-ctrlfile.write("Source: %s\n" % " ".join(src_uri.split()))
 ctrlfile.close()
 
 for script in ["preinst", "postinst", "prerm", "postrm"]:
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] image_types.bbclass: get rid of IMAGE_DEPENDS

[Richard Purdie]

On Thu, 2017-06-15 at 14:25 +0100, Burton, Ross wrote:
> 
> On 15 June 2017 at 12:59, Ed Bartosh 
> wrote:
> > The IMAGE_DEPENDS variable can be overriden to add dependencies for
> > individual image types.  Those dependencies are added to the
> > do_rootfs
> > task, while they really should be added to the specific image type
> > tasks.
> > 
> Other layers such as meta-raspberrypi use IMAGE_DEPENDS, should we
> move oe-core to use [depends] but handle IMAGE_DEPENDS (with a
> deprecation warning) for some of the 2.4 cycle?

Yes, a fatal error if IMAGE_DEPENDS is set and telling the user what to
change it to would be best IMO.

Cheers,

Richard
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] image_types.bbclass: get rid of IMAGE_DEPENDS

[Burton, Ross]

On 15 June 2017 at 12:59, Ed Bartosh  wrote:

> The IMAGE_DEPENDS variable can be overriden to add dependencies for
> individual image types.  Those dependencies are added to the do_rootfs
> task, while they really should be added to the specific image type tasks.
>

Other layers such as meta-raspberrypi use IMAGE_DEPENDS, should we move
oe-core to use [depends] but handle IMAGE_DEPENDS (with a deprecation
warning) for some of the 2.4 cycle?

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v3 2/7] libxml2: Avoid reparsing and simplify control flow in xmlParseStartTag2

[Burton, Ross]

On 15 June 2017 at 13:46, Andrej Valek  wrote:

> https://github.com/openembedded/openembedded-core/pull/22
>

That will do, thanks.

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2 1/4] masterimage.py: fix issue with calling reboot on masterimage/DUT

[Zeeshan Ali (Khattak)]

Hi,

Has this been already merged? I ask cause there is a small change
needed for large-enough rootfs:

> diff --git a/meta/lib/oeqa/controllers/masterimage.py 
> b/meta/lib/oeqa/controllers/masterimage.py
> index 07418fcda1..6cdcfa3068 100644
> --- a/meta/lib/oeqa/controllers/masterimage.py
> +++ b/meta/lib/oeqa/controllers/masterimage.py
> @@ -108,7 +108,7 @@ class 
> MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta
>  time.sleep(10)
>  self.power_ctl("cycle")
>  else:
> -status, output = conn.run("reboot")
> +status, output = conn.run("{ sleep 1; reboot; } > /dev/null &")

Should instead be:

+status, output = conn.run("sync; { sleep 1; reboot; } >
/dev/null &")

Otherwise, syncing happens as part of reboot (unmounting) and reboot
takes much longer than testing code expect it to and hence fails if it
tries to access/ping the target while reboot is still in progress.

If the patch has been applied, I can send an additional patch;
otherwise I can send a revised version of this patch.

-- 
Regards,

Zeeshan Ali
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core][v3][PATCH 1/3] ghostscript: move to version 9.21

[Burton, Ross]

On 13 June 2017 at 20:50, Joe Slater  wrote:

> Eliminate CVE patches that are now in source.  Add CVE-2017-7975
> patch.
>

ERROR: ghostscript-9.21-r0 do_patch: Command Error: 'quilt --quiltrc
/data/poky-tmp/master/work/corei7-64-poky-linux/ghostscript/9.21-r0/recipe-sysroot-native/etc/quiltrc
push' exited with 0  Output:
Applying patch CVE-2016-7978.patch
patching file base/gsdevice.c
Hunk #1 FAILED at 614.
1 out of 1 hunk FAILED -- rejects in file base/gsdevice.c
Patch CVE-2016-7978.patch can be reverse-applied

If that is already applied then there's likely more too.

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] selftest: Add Testopia ID to test cases

[jose . perez . carranza]

From: Jose Perez Carranza 

Add decorator @OETestID() with proper Tesopia TC ID to the test cases
that did not have it set.

Signed-off-by: Jose Perez Carranza 
---
 meta/lib/oeqa/selftest/cases/containerimage.py |  2 ++
 meta/lib/oeqa/selftest/cases/devtool.py| 10 ++
 meta/lib/oeqa/selftest/cases/image_typedep.py  |  2 ++
 meta/lib/oeqa/selftest/cases/imagefeatures.py  |  1 +
 meta/lib/oeqa/selftest/cases/liboe.py  |  4 
 meta/lib/oeqa/selftest/cases/oelib/buildhistory.py |  4 
 meta/lib/oeqa/selftest/cases/package.py|  4 
 meta/lib/oeqa/selftest/cases/recipetool.py |  4 
 meta/lib/oeqa/selftest/cases/runtime_test.py   |  4 
 meta/lib/oeqa/selftest/cases/sstatetests.py|  2 ++
 meta/lib/oeqa/selftest/cases/tinfoil.py|  1 +
 meta/lib/oeqa/selftest/cases/wic.py| 19 +++
 12 files changed, 57 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/containerimage.py 
b/meta/lib/oeqa/selftest/cases/containerimage.py
index 73162fa600a..99a5cc9e575 100644
--- a/meta/lib/oeqa/selftest/cases/containerimage.py
+++ b/meta/lib/oeqa/selftest/cases/containerimage.py
@@ -2,6 +2,7 @@ import os
 
 from oeqa.selftest.case import OESelftestTestCase
 from oeqa.utils.commands import bitbake, get_bb_vars, runCmd
+from oeqa.core.decorator.oeid import OETestID
 
 # This test builds an image with using the "container" IMAGE_FSTYPE, and
 # ensures that then files in the image are only the ones expected.
@@ -20,6 +21,7 @@ class ContainerImageTests(OESelftestTestCase):
 
 # Verify that when specifying a IMAGE_TYPEDEP_ of the form "foo.bar" that
 # the conversion type bar gets added as a dep as well
+@OETestID(1619)
 def test_expected_files(self):
 
 def get_each_path_part(path):
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index 06ecf404738..a0406e6b1f6 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -491,6 +491,7 @@ class DevtoolTests(DevtoolBase):
 result = runCmd('devtool status')
 self.assertNotIn('mdadm', result.output)
 
+@OETestID(1620)
 def test_devtool_buildclean(self):
 def assertFile(path, *paths):
 f = os.path.join(path, *paths)
@@ -1013,6 +1014,7 @@ class DevtoolTests(DevtoolBase):
('??', '.*/0001-Add-new-file.patch$')]
 self._check_repo_status(os.path.dirname(recipefile), expected_status)
 
+@OETestID(1627)
 def test_devtool_update_recipe_local_files_3(self):
 # First, modify the recipe
 testrecipe = 'devtool-test-localonly'
@@ -1032,6 +1034,7 @@ class DevtoolTests(DevtoolBase):
 expected_status = [(' M', '.*/%s/file2$' % testrecipe)]
 self._check_repo_status(os.path.dirname(recipefile), expected_status)
 
+@OETestID(1629)
 def test_devtool_update_recipe_local_patch_gz(self):
 # First, modify the recipe
 testrecipe = 'devtool-test-patch-gz'
@@ -1059,6 +1062,7 @@ class DevtoolTests(DevtoolBase):
 if 'gzip compressed data' not in result.output:
 self.fail('New patch file is not gzipped - file reports:\n%s' % 
result.output)
 
+@OETestID(1628)
 def test_devtool_update_recipe_local_files_subdir(self):
 # Try devtool extract on a recipe that has a file with subdir= set in
 # SRC_URI such that it overwrites a file that was in an archive that
@@ -1363,6 +1367,7 @@ class DevtoolTests(DevtoolBase):
 shutil.copy(srcfile, dstfile)
 self.track_for_cleanup(dstfile)
 
+@OETestID(1625)
 def test_devtool_load_plugin(self):
 """Test that devtool loads only the first found plugin in BBPATH."""
 
@@ -1430,6 +1435,7 @@ class DevtoolTests(DevtoolBase):
 self.assertTrue(os.path.exists(os.path.join(olddir, patchfn)), 
'Original patch file does not exist')
 return recipe, oldrecipefile, recipedir, olddir, newversion, patchfn
 
+@OETestID(1623)
 def test_devtool_finish_upgrade_origlayer(self):
 recipe, oldrecipefile, recipedir, olddir, newversion, patchfn = 
self._setup_test_devtool_finish_upgrade()
 # Ensure the recipe is where we think it should be (so that cleanup 
doesn't trash things)
@@ -1448,6 +1454,7 @@ class DevtoolTests(DevtoolBase):
 self.assertTrue(os.path.exists(os.path.join(newdir, patchfn)), 'Patch 
file should have been copied into new directory but wasn\'t')
 self.assertTrue(os.path.exists(os.path.join(newdir, 
'0002-Add-a-comment-to-the-code.patch')), 'New patch file should have been 
created but wasn\'t')
 
+@OETestID(1624)
 def test_devtool_finish_upgrade_otherlayer(self):
 recipe, oldrecipefile, recipedir, olddir, newversion, patchfn = 
self._setup_test_devtool_finish_upgrade()
 # 

[OE-core] [PATCH 1/2] systemdboot: Add Test to check boot file is created correctly

[jose . perez . carranza]

From: Jose Perez Carranza 

Add Test case to verify if EFI bootloader for
systemd boot is correctly build inside of image.

[YOCTO #9903]

Signed-off-by: Jose Perez Carranza 
---
 .../lib/oeqa/selftest/cases/systemd_boot.py| 54 --
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py 
b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
index 848cdf78524..dd5eeec1633 100644
--- a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
+++ b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
@@ -2,25 +2,26 @@ import os
 
 from oeqa.selftest.case import OESelftestTestCase
 from oeqa.core.decorator.oeid import OETestID
+from oeqa.core.decorator.depends import OETestDepends
 from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu
 
 class Systemdboot(OESelftestTestCase):
 def _common_setup(self):
 """
-Common setup for test cases: 1445, 
+Common setup for test cases: 1445, 1528
 """
 
-# Set EFI_PROVIDER = "gummiboot" and MACHINE = "genericx86-64" in 
conf/local.conf
+# Set EFI_PROVIDER = "systemdboot" and MACHINE = "genericx86-64" in 
conf/local.conf
 features = 'EFI_PROVIDER = "systemd-boot"\n'
 features += 'MACHINE = "genericx86-64"'
 self.append_config(features)
 
 def _common_build(self):
 """
-Common build for test cases: 1445 , 
+Common build for test cases: 1445 , 1528
 """
 
-# Build a genericx86-64/efi gummiboot image
+# Build a genericx86-64/efi systemdboot image
 bitbake('mtools-native core-image-minimal')
 
 
@@ -50,3 +51,48 @@ class Systemdboot(OESelftestTestCase):
 
 found = os.path.isfile(systemdbootfile)
 self.assertTrue(found, 'Systemd-Boot file %s not found' % 
systemdbootfile)
+
+@OETestID(1528)
+
@OETestDepends(['systemd_boot.Systemdboot.test_efi_systemdboot_images_can_be_built'])
+def test_image_efi_file(self):
+
+"""
+Summary:  Check if EFI bootloader for systemd is correctly build
+Dependencies: Image was built correctly on testcase 1445
+Steps:1. Copy bootx64.efi file form the hddimg created
+  under build/tmp/deploy/images/genericx86-64
+  2. Check bootx64.efi was copied form hddimg
+  3. Verify the checksums from the copied and previously
+  created file are equal.
+Expected :Systemd-bootx64.efi and bootx64.efi should be the same
+  hence checksums should be equal.
+Product:  oe-core
+Author:   Jose Perez Carranza 
+AutomatedBy:  Jose Perez Carranza 
+"""
+
+systemdbootfile = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 
'genericx86-64',
+   'systemd-bootx64.efi')
+systemdbootimage = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 
'genericx86-64',
+
'core-image-minimal-genericx86-64.hddimg')
+imagebootfile = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 
'genericx86-64',
+'bootx64.efi')
+mcopynative = os.path.join(get_bb_var('STAGING_BINDIR_NATIVE'), 
'mcopy')
+
+#Clean environment before start the test
+if os.path.isfile(imagebootfile):
+runCmd('rm -f %s' % imagebootfile)
+
+#Step 1
+runCmd('%s -i %s ::EFI/BOOT/bootx64.efi %s' % (mcopynative 
,systemdbootimage,
+   imagebootfile))
+
+#Step 2
+found = os.path.isfile(imagebootfile)
+self.assertTrue(found, 'bootx64.efi file %s was not copied from 
image'
+% imagebootfile)
+
+#Step 3
+result = runCmd('md5sum %s %s' % (systemdbootfile, imagebootfile))
+self.assertEqual(result.output.split()[0], 
result.output.split()[2],
+ '%s was not correclty generated' % imagebootfile)
-- 
2.12.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v3 2/7] libxml2: Avoid reparsing and simplify control flow in xmlParseStartTag2

[Andrej Valek]

I have created a PR:
https://github.com/openembedded/openembedded-core/pull/22

Andrej

On 06/15/2017 02:15 PM, Burton, Ross wrote:
> This patch won't apply, probably because of the crazy encodings.  Can you 
> push 
> the series to a branch?
> 
> Ross
> 
> On 15 June 2017 at 13:08, Andrej Valek  > wrote:
> 
> Signed-off-by: Andrej Valek  >
> ---
>   ...ibxml2-fix_and_simplify_xmlParseStartTag2.patch | 590 
> +
>   meta/recipes-core/libxml/libxml2_2.9.4.bb  
>   
>|   1 +
>   2 files changed, 591 insertions(+)
>   create mode 100644
> 
> meta/recipes-core/libxml/libxml2/libxml2-fix_and_simplify_xmlParseStartTag2.patch
> 
> diff --git
> 
> a/meta/recipes-core/libxml/libxml2/libxml2-fix_and_simplify_xmlParseStartTag2.patch
> 
> b/meta/recipes-core/libxml/libxml2/libxml2-fix_and_simplify_xmlParseStartTag2.patch
> new file mode 100644
> index 000..faa5770
> --- /dev/null
> +++
> 
> b/meta/recipes-core/libxml/libxml2/libxml2-fix_and_simplify_xmlParseStartTag2.patch
> @@ -0,0 +1,590 @@
> +libxml2-2.9.4: Avoid reparsing and simplify control flow in 
> xmlParseStartTag2
> +
> +[No upstream tracking]
> +
> +parser: Avoid reparsing in xmlParseStartTag2
> +
> +The code in xmlParseStartTag2 must handle the case that the input
> +buffer was grown and reallocated which can invalidate pointers to
> +attribute values. Before, this was handled by detecting changes of
> +the input buffer "base" pointer and, in case of a change, jumping
> +back to the beginning of the function and reparsing the start tag.
> +
> +The major problem of this approach is that whether an input buffer is
> +reallocated is nondeterministic, resulting in seemingly random test
> +failures. See the mailing list thread "runtest mystery bug: name2.xml
> +error case regression test" from 2012, for example.
> +
> +If a reallocation was detected, the code also made no attempts to
> +continue parsing in case of errors which makes a difference in
> +the lax "recover" mode.
> +
> +Now we store the current input buffer "base" pointer for each (not
> +separately allocated) attribute in the namespace URI field, which isn't
> +used until later. After the whole start tag was parsed, the pointers to
> +the attribute values are reconstructed using the offset between the
> +new and the old input buffer. This relies on arithmetic on dangling
> +pointers which is technically undefined behavior. But it seems like
> +the easiest and most efficient fix and a similar approach is used in
> +xmlParserInputGrow.
> +
> +This changes the error output of several tests, typically making it
> +more verbose because we try harder to continue parsing in case of errors.
> +
> +(Another possible solution is to check not only the "base" pointer
> +but the size of the input buffer as well. But this would result in
> +even more reparsing.)
> +
> +Remove some goto labels and deduplicate a bit of code after handling
> +namespaces.
> +
> +There were two bugs where parameter-entity references could lead to an
> +unexpected change of the input buffer in xmlParseNameComplex and
> +xmlDictLookup being called with an invalid pointer.
> +
> +
> +Upstream-Status: Backport
> + -
> 
> [https://git.gnome.org/browse/libxml2/commit/?id=07b7428b69c368611d215a140fe630b2d1e61349
> 
> ]
> + -
> 
> [https://git.gnome.org/browse/libxml2/commit/?id=855c19efb7cd30d927d673b3658563c4959ca6f0
> 
> ]
> +Signed-off-by: Andrej Valek  >
> +
> +diff --git a/parser.c b/parser.c
> +index 609a270..74016e3 100644
> +--- a/parser.c
>  b/parser.c
> +@@ -43,6 +43,7 @@
> + #include 
> + #include 
> + #include 
> ++#include 
> + #include 
> + #include 
> + #include 
> +@@ -9377,8 +9378,7 @@ xmlParseStartTag2(xmlParserCtxtPtr ctxt, const
> xmlChar **pref,
> + const xmlChar **atts = ctxt->atts;
> + int maxatts = ctxt->maxatts;
> + int nratts, nbatts, nbdef;
> +-int i, j, nbNs, attval, oldline, oldcol, inputNr;
> +-const xmlChar *base;
> ++int i, j, nbNs, attval;
> + unsigned long cur;
> + int nsNr = ctxt->nsNr;
> +
> +@@ -9392,13 +9392,8 @@ xmlParseStartTag2(xmlParserCtxtPtr ctxt, const
> xmlChar **pref,
> +  *   The Shrinking is only possible once the full set of 
> attribute
> + 

Re: [OE-core] [PATCH 1/2] ncurses: add SYSROOT_DESTDIR for siteconfig_gencache

[Burton, Ross]

On 31 May 2017 at 09:27,  wrote:

> +EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'"
>

Why is this ncurses specific, it sounds like something which will impact
all users of siteconfig?

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] wic: add /boot mount point to fstab by default

[Ed Bartosh]

wic avoided adding /boot to fstab for no reason.
This exception was hardcoded in the wic code.

There is no need for this as mountpoint in .wks file is an optional
field. It can be added only if its needed to have partitions
automatically mounted on system boot.

[YOCTO #11662]

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/plugins/imager/direct.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/plugins/imager/direct.py 
b/scripts/lib/wic/plugins/imager/direct.py
index 3cdedd1..f252697 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -127,7 +127,7 @@ class DirectPlugin(ImagerPlugin):
 updated = False
 for part in parts:
 if not part.realnum or not part.mountpoint \
-   or part.mountpoint in ("/", "/boot"):
+   or part.mountpoint == "/":
 continue
 
 # mmc device partitions are named mmcblk0p1, mmcblk0p2..
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v3 2/7] libxml2: Avoid reparsing and simplify control flow in xmlParseStartTag2

[Burton, Ross]

This patch won't apply, probably because of the crazy encodings.  Can you
push the series to a branch?

Ross

On 15 June 2017 at 13:08, Andrej Valek  wrote:

> Signed-off-by: Andrej Valek 
> ---
>  ...ibxml2-fix_and_simplify_xmlParseStartTag2.patch | 590
> +
>  meta/recipes-core/libxml/libxml2_2.9.4.bb  |   1 +
>  2 files changed, 591 insertions(+)
>  create mode 100644 meta/recipes-core/libxml/libxml2/libxml2-fix_and_
> simplify_xmlParseStartTag2.patch
>
> diff --git a/meta/recipes-core/libxml/libxml2/libxml2-fix_and_
> simplify_xmlParseStartTag2.patch b/meta/recipes-core/libxml/
> libxml2/libxml2-fix_and_simplify_xmlParseStartTag2.patch
> new file mode 100644
> index 000..faa5770
> --- /dev/null
> +++ b/meta/recipes-core/libxml/libxml2/libxml2-fix_and_
> simplify_xmlParseStartTag2.patch
> @@ -0,0 +1,590 @@
> +libxml2-2.9.4: Avoid reparsing and simplify control flow in
> xmlParseStartTag2
> +
> +[No upstream tracking]
> +
> +parser: Avoid reparsing in xmlParseStartTag2
> +
> +The code in xmlParseStartTag2 must handle the case that the input
> +buffer was grown and reallocated which can invalidate pointers to
> +attribute values. Before, this was handled by detecting changes of
> +the input buffer "base" pointer and, in case of a change, jumping
> +back to the beginning of the function and reparsing the start tag.
> +
> +The major problem of this approach is that whether an input buffer is
> +reallocated is nondeterministic, resulting in seemingly random test
> +failures. See the mailing list thread "runtest mystery bug: name2.xml
> +error case regression test" from 2012, for example.
> +
> +If a reallocation was detected, the code also made no attempts to
> +continue parsing in case of errors which makes a difference in
> +the lax "recover" mode.
> +
> +Now we store the current input buffer "base" pointer for each (not
> +separately allocated) attribute in the namespace URI field, which isn't
> +used until later. After the whole start tag was parsed, the pointers to
> +the attribute values are reconstructed using the offset between the
> +new and the old input buffer. This relies on arithmetic on dangling
> +pointers which is technically undefined behavior. But it seems like
> +the easiest and most efficient fix and a similar approach is used in
> +xmlParserInputGrow.
> +
> +This changes the error output of several tests, typically making it
> +more verbose because we try harder to continue parsing in case of errors.
> +
> +(Another possible solution is to check not only the "base" pointer
> +but the size of the input buffer as well. But this would result in
> +even more reparsing.)
> +
> +Remove some goto labels and deduplicate a bit of code after handling
> +namespaces.
> +
> +There were two bugs where parameter-entity references could lead to an
> +unexpected change of the input buffer in xmlParseNameComplex and
> +xmlDictLookup being called with an invalid pointer.
> +
> +
> +Upstream-Status: Backport
> + - [https://git.gnome.org/browse/libxml2/commit/?id=
> 07b7428b69c368611d215a140fe630b2d1e61349]
> + - [https://git.gnome.org/browse/libxml2/commit/?id=
> 855c19efb7cd30d927d673b3658563c4959ca6f0]
> +Signed-off-by: Andrej Valek 
> +
> +diff --git a/parser.c b/parser.c
> +index 609a270..74016e3 100644
> +--- a/parser.c
>  b/parser.c
> +@@ -43,6 +43,7 @@
> + #include 
> + #include 
> + #include 
> ++#include 
> + #include 
> + #include 
> + #include 
> +@@ -9377,8 +9378,7 @@ xmlParseStartTag2(xmlParserCtxtPtr ctxt, const
> xmlChar **pref,
> + const xmlChar **atts = ctxt->atts;
> + int maxatts = ctxt->maxatts;
> + int nratts, nbatts, nbdef;
> +-int i, j, nbNs, attval, oldline, oldcol, inputNr;
> +-const xmlChar *base;
> ++int i, j, nbNs, attval;
> + unsigned long cur;
> + int nsNr = ctxt->nsNr;
> +
> +@@ -9392,13 +9392,8 @@ xmlParseStartTag2(xmlParserCtxtPtr ctxt, const
> xmlChar **pref,
> +  *   The Shrinking is only possible once the full set of
> attribute
> +  *   callbacks have been done.
> +  */
> +-reparse:
> + SHRINK;
> +-base = ctxt->input->base;
> + cur = ctxt->input->cur - ctxt->input->base;
> +-inputNr = ctxt->inputNr;
> +-oldline = ctxt->input->line;
> +-oldcol = ctxt->input->col;
> + nbatts = 0;
> + nratts = 0;
> + nbdef = 0;
> +@@ -9422,8 +9417,6 @@ reparse:
> +  */
> + SKIP_BLANKS;
> + GROW;
> +-if ((ctxt->input->base != base) || (inputNr != ctxt->inputNr))
> +-goto base_changed;
> +
> + while (((RAW != '>') &&
> +  ((RAW != '/') || (NXT(1) != '>')) &&
> +@@ -9434,203 +9427,174 @@ reparse:
> +
> +   attname = xmlParseAttribute2(ctxt, prefix, localname,
> +, , , );
> +-  if ((ctxt->input->base != base) || (inputNr != ctxt->inputNr)) {
> +-  if ((attvalue != NULL) && (alloc != 0))
> +-  

Re: [OE-core] [PATCH v2 1/7] libxml2: Disable LeakSanitizer when running API tests

[Andrej Valek]

I have modified all patches and posted in
http://lists.openembedded.org/pipermail/openembedded-core/2017-June/138219.html
.

Andrej

On 06/15/2017 01:47 PM, Burton, Ross wrote:
> 
> On 15 June 2017 at 12:42, Andrej Valek  > wrote:
> 
> I am modifying already existing patch not creating the new one. Is it
> necessary to change Upstream-Status to backported?
> 
> If yes, is it possible to fix only this patch, or do I need to push the
> whole series?
> 
> 
> If the patch is backported from upstream then please correct the status to be 
> backported, and remove the U-S from the commit message.
> 
> Also a later patch in the series uses "Backported" when the status is 
> Backport, 
> please verify that all the patches have the right tags as there are scripts 
> which read the values.
> 
> Ross
> 
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v3 4/7] libxml2: Fix CVE-2017-9049 and CVE-2017-9050

[Andrej Valek]

Fix handling of parameter-entity references

There were two bugs where parameter-entity references could lead to an
unexpected change of the input buffer in xmlParseNameComplex and
xmlDictLookup being called with an invalid pointer.

Fixes bug 781205 and bug 781361

CVE: CVE-2017-9049 CVE-2017-9050
Signed-off-by: Andrej Valek 
---
 .../libxml2-CVE-2017-9049_CVE-2017-9050.patch  | 291 +
 meta/recipes-core/libxml/libxml2_2.9.4.bb  |   1 +
 2 files changed, 292 insertions(+)
 create mode 100644 
meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-9049_CVE-2017-9050.patch

diff --git 
a/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-9049_CVE-2017-9050.patch 
b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-9049_CVE-2017-9050.patch
new file mode 100644
index 000..591075d
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-9049_CVE-2017-9050.patch
@@ -0,0 +1,291 @@
+libxml2-2.9.4: Fix CVE-2017-9049 and CVE-2017-9050
+
+[No upstream tracking] -- https://bugzilla.gnome.org/show_bug.cgi?id=781205
+ -- https://bugzilla.gnome.org/show_bug.cgi?id=781361
+
+parser: Fix handling of parameter-entity references
+
+There were two bugs where parameter-entity references could lead to an
+unexpected change of the input buffer in xmlParseNameComplex and
+xmlDictLookup being called with an invalid pointer.
+
+Percent sign in DTD Names
+=
+
+The NEXTL macro used to call xmlParserHandlePEReference. When parsing
+"complex" names inside the DTD, this could result in entity expansion
+which created a new input buffer. The fix is to simply remove the call
+to xmlParserHandlePEReference from the NEXTL macro. This is safe because
+no users of the macro require expansion of parameter entities.
+
+- xmlParseNameComplex
+- xmlParseNCNameComplex
+- xmlParseNmtoken
+
+The percent sign is not allowed in names, which are grammatical tokens.
+
+- xmlParseEntityValue
+
+Parameter-entity references in entity values are expanded but this
+happens in a separate step in this function.
+
+- xmlParseSystemLiteral
+
+Parameter-entity references are ignored in the system literal.
+
+- xmlParseAttValueComplex
+- xmlParseCharDataComplex
+- xmlParseCommentComplex
+- xmlParsePI
+- xmlParseCDSect
+
+Parameter-entity references are ignored outside the DTD.
+
+- xmlLoadEntityContent
+
+This function is only called from xmlStringLenDecodeEntities and
+entities are replaced in a separate step immediately after the function
+call.
+
+This bug could also be triggered with an internal subset and double
+entity expansion.
+
+This fixes bug 766956 initially reported by Wei Lei and independently by
+Chromium's ClusterFuzz, Hanno Böck, and Marco Grassi. Thanks to everyone
+involved.
+
+xmlParseNameComplex with XML_PARSE_OLD10
+
+
+When parsing Names inside an expanded parameter entity with the
+XML_PARSE_OLD10 option, xmlParseNameComplex would call xmlGROW via the
+GROW macro if the input buffer was exhausted. At the end of the
+parameter entity's replacement text, this function would then call
+xmlPopInput which invalidated the input buffer.
+
+There should be no need to invoke GROW in this situation because the
+buffer is grown periodically every XML_PARSER_CHUNK_SIZE characters and,
+at least for UTF-8, in xmlCurrentChar. This also matches the code path
+executed when XML_PARSE_OLD10 is not set.
+
+This fixes bugs 781205 (CVE-2017-9049) and 781361 (CVE-2017-9050).
+Thanks to Marcel Böhme and Thuan Pham for the report.
+
+Additional hardening
+
+
+A separate check was added in xmlParseNameComplex to validate the
+buffer size.
+
+Fixes bug 781205 and bug 781361
+
+Upstream-Status: Backport 
[https://git.gnome.org/browse/libxml2/commit/?id=932cc9896ab41475d4aa429c27d9afd175959d74]
+CVE: CVE-2017-9049 CVE-2017-9050
+Signed-off-by: Andrej Valek 
+
+diff --git a/Makefile.am b/Makefile.am
+index 9f988b0..dab15a4 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -422,6 +422,24 @@ Errtests : xmllint$(EXEEXT)
+ if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+ rm result.$$name error.$$name ; \
+ fi ; fi ; done)
++  @echo "## Error cases regression tests (old 1.0)"
++  -@(for i in $(srcdir)/test/errors10/*.xml ; do \
++name=`basename $$i`; \
++if [ ! -d $$i ] ; then \
++if [ ! -f $(srcdir)/result/errors10/$$name ] ; then \
++echo New test file $$name ; \
++$(CHECKER) $(top_builddir)/xmllint --oldxml10 $$i \
++   2> $(srcdir)/result/errors10/$$name.err \
++   > $(srcdir)/result/errors10/$$name ; \
++grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
++else \
++log=`$(CHECKER) $(top_builddir)/xmllint --oldxml10 $$i 2> 
error.$$name > result.$$name ; \
++grep "MORY ALLO" .memdump  | grep -v "MEMORY 

[OE-core] [PATCH v3 7/7] libxml2: Revert "Add an XML_PARSE_NOXXE flag to block all entities loading even local"

[Andrej Valek]

The new flag doesn't work and the change even broke the XML_PARSE_NONET option.

Signed-off-by: Andrej Valek 
---
 .../libxml/libxml2/CVE-2016-9318.patch | 207 -
 meta/recipes-core/libxml/libxml2_2.9.4.bb  |   1 -
 2 files changed, 208 deletions(-)
 delete mode 100644 meta/recipes-core/libxml/libxml2/CVE-2016-9318.patch

diff --git a/meta/recipes-core/libxml/libxml2/CVE-2016-9318.patch 
b/meta/recipes-core/libxml/libxml2/CVE-2016-9318.patch
deleted file mode 100644
index 3581ab8..000
--- a/meta/recipes-core/libxml/libxml2/CVE-2016-9318.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 7fa1cd31552d52d50a9101f07c816ff6dd2d9f19 Mon Sep 17 00:00:00 2001
-From: Doran Moppert 
-Date: Fri, 7 Apr 2017 16:45:56 +0200
-Subject: [PATCH] Add an XML_PARSE_NOXXE flag to block all entities loading
- even local
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=772726
-
-* include/libxml/parser.h: Add a new parser flag XML_PARSE_NOXXE
-* elfgcchack.h, xmlIO.h, xmlIO.c: associated loading routine
-* include/libxml/xmlerror.h: new error raised
-* xmllint.c: adds --noxxe flag to activate the option
-
-Upstream-Status: Backport
-CVE: CVE-2016-9318
-
-Signed-off-by: Catalin Enache 

- elfgcchack.h  | 10 ++
- include/libxml/parser.h   |  3 ++-
- include/libxml/xmlIO.h|  8 
- include/libxml/xmlerror.h |  1 +
- parser.c  |  4 
- xmlIO.c   | 40 +++-
- xmllint.c |  5 +
- 7 files changed, 65 insertions(+), 6 deletions(-)
-
-diff --git a/elfgcchack.h b/elfgcchack.h
-index 8c52884..1b81dcd 100644
 a/elfgcchack.h
-+++ b/elfgcchack.h
-@@ -6547,6 +6547,16 @@ extern __typeof (xmlNoNetExternalEntityLoader) 
xmlNoNetExternalEntityLoader__int
- #endif
- #endif
- 
-+#ifdef bottom_xmlIO
-+#undef xmlNoXxeExternalEntityLoader
-+extern __typeof (xmlNoXxeExternalEntityLoader) xmlNoXxeExternalEntityLoader 
__attribute((alias("xmlNoXxeExternalEntityLoader__internal_alias")));
-+#else
-+#ifndef xmlNoXxeExternalEntityLoader
-+extern __typeof (xmlNoXxeExternalEntityLoader) 
xmlNoXxeExternalEntityLoader__internal_alias 
__attribute((visibility("hidden")));
-+#define xmlNoXxeExternalEntityLoader 
xmlNoXxeExternalEntityLoader__internal_alias
-+#endif
-+#endif
-+
- #ifdef bottom_tree
- #undef xmlNodeAddContent
- extern __typeof (xmlNodeAddContent) xmlNodeAddContent 
__attribute((alias("xmlNodeAddContent__internal_alias")));
-diff --git a/include/libxml/parser.h b/include/libxml/parser.h
-index 47fbec0..63ca1b9 100644
 a/include/libxml/parser.h
-+++ b/include/libxml/parser.h
-@@ -,7 +,8 @@ typedef enum {
- XML_PARSE_HUGE  = 1<<19,/* relax any hardcoded limit from the parser 
*/
- XML_PARSE_OLDSAX= 1<<20,/* parse using SAX2 interface before 2.7.0 */
- XML_PARSE_IGNORE_ENC= 1<<21,/* ignore internal document encoding hint */
--XML_PARSE_BIG_LINES = 1<<22 /* Store big lines numbers in text PSVI field 
*/
-+XML_PARSE_BIG_LINES = 1<<22,/* Store big lines numbers in text PSVI field 
*/
-+XML_PARSE_NOXXE   = 1<<23 /* Forbid any external entity loading */
- } xmlParserOption;
- 
- XMLPUBFUN void XMLCALL
-diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h
-index 3e41744..8d3fdef 100644
 a/include/libxml/xmlIO.h
-+++ b/include/libxml/xmlIO.h
-@@ -300,6 +300,14 @@ XMLPUBFUN xmlParserInputPtr XMLCALL
-xmlParserCtxtPtr ctxt);
- 
- /*
-+ * A predefined entity loader external entity expansion
-+ */
-+XMLPUBFUN xmlParserInputPtr XMLCALL
-+  xmlNoXxeExternalEntityLoader(const char *URL,
-+   const char *ID,
-+   xmlParserCtxtPtr ctxt);
-+
-+/*
-  * xmlNormalizeWindowsPath is obsolete, don't use it.
-  * Check xmlCanonicPath in uri.h for a better alternative.
-  */
-diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h
-index 037c16d..3036062 100644
 a/include/libxml/xmlerror.h
-+++ b/include/libxml/xmlerror.h
-@@ -470,6 +470,7 @@ typedef enum {
- XML_IO_EADDRINUSE, /* 1554 */
- XML_IO_EALREADY, /* 1555 */
- XML_IO_EAFNOSUPPORT, /* 1556 */
-+XML_IO_ILLEGAL_XXE, /* 1557 */
- XML_XINCLUDE_RECURSION=1600,
- XML_XINCLUDE_PARSE_VALUE, /* 1601 */
- XML_XINCLUDE_ENTITY_DEF_MISMATCH, /* 1602 */
-diff --git a/parser.c b/parser.c
-index 53a6b7f..609a270 100644
 a/parser.c
-+++ b/parser.c
-@@ -15350,6 +15350,10 @@ xmlCtxtUseOptionsInternal(xmlParserCtxtPtr ctxt, int 
options, const char *encodi
-   ctxt->options |= XML_PARSE_NONET;
- options -= XML_PARSE_NONET;
- }
-+if (options & XML_PARSE_NOXXE) {
-+  ctxt->options |= XML_PARSE_NOXXE;
-+options -= XML_PARSE_NOXXE;
-+}
- if (options & XML_PARSE_COMPACT) {
-   ctxt->options |= XML_PARSE_COMPACT;
- options -= 

[OE-core] [PATCH v3 6/7] libxml2: Fix CVE-2017-0663

[Andrej Valek]

Fix type confusion in xmlValidateOneNamespace

Comment out code that casts xmlNsPtr to xmlAttrPtr. ID types
on namespace declarations make no practical sense anyway.

Fixes bug 780228

CVE: CVE-2017-0663
Signed-off-by: Andrej Valek 
---
 .../libxml/libxml2/libxml2-CVE-2017-0663.patch | 40 ++
 meta/recipes-core/libxml/libxml2_2.9.4.bb  |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-0663.patch

diff --git a/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-0663.patch 
b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-0663.patch
new file mode 100644
index 000..0108265
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-0663.patch
@@ -0,0 +1,40 @@
+libxml2: Fix CVE-2017-0663
+
+[No upstream tracking] -- https://bugzilla.gnome.org/show_bug.cgi?id=780228
+
+valid: Fix type confusion in xmlValidateOneNamespace
+
+Comment out code that casts xmlNsPtr to xmlAttrPtr. ID types
+on namespace declarations make no practical sense anyway.
+
+Fixes bug 780228
+
+Upstream-Status: Backport 
[https://git.gnome.org/browse/libxml2/commit/?id=92b9e8c8b3787068565a1820ba575d042f9eec66]
+CVE: CVE-2017-0663
+Signed-off-by: Andrej Valek 
+
+diff --git a/valid.c b/valid.c
+index 19f84b8..e03d35e 100644
+--- a/valid.c
 b/valid.c
+@@ -4621,6 +4621,12 @@ xmlNodePtr elem, const xmlChar *prefix, xmlNsPtr ns, 
const xmlChar *value) {
+   }
+ }
+ 
++/*
++ * Casting ns to xmlAttrPtr is wrong. We'd need separate functions
++ * xmlAddID and xmlAddRef for namespace declarations, but it makes
++ * no practical sense to use ID types anyway.
++ */
++#if 0
+ /* Validity Constraint: ID uniqueness */
+ if (attrDecl->atype == XML_ATTRIBUTE_ID) {
+ if (xmlAddID(ctxt, doc, value, (xmlAttrPtr) ns) == NULL)
+@@ -4632,6 +4638,7 @@ xmlNodePtr elem, const xmlChar *prefix, xmlNsPtr ns, 
const xmlChar *value) {
+ if (xmlAddRef(ctxt, doc, value, (xmlAttrPtr) ns) == NULL)
+   ret = 0;
+ }
++#endif
+ 
+ /* Validity Constraint: Notation Attributes */
+ if (attrDecl->atype == XML_ATTRIBUTE_NOTATION) {
diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb 
b/meta/recipes-core/libxml/libxml2_2.9.4.bb
index 2996809..677d8c9 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.4.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb
@@ -27,6 +27,7 @@ SRC_URI = 
"ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \
file://libxml2-CVE-2017-9047_CVE-2017-9048.patch \
file://libxml2-CVE-2017-9049_CVE-2017-9050.patch \
file://libxml2-CVE-2017-5969.patch \
+   file://libxml2-CVE-2017-0663.patch \
file://CVE-2016-9318.patch \

file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \
"
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v3 0/7] libxml2: Fix multiple CVEs

[Andrej Valek]

Fix CVE:
 - CVE-2017-0663
 - CVE-2017-9047
 - CVE-2017-9048
 - CVE-2017-9049
 - CVE-2017-9050
 - CVE-2017-5969
 - Sync necessary changes for CVE fixing from master.

Andrej Valek (7):
  libxml2: Disable LeakSanitizer when running API tests
  libxml2: Avoid reparsing and simplify control flow in
xmlParseStartTag2
  libxml2: Fix CVE-2017-9047 and CVE-2017-9048
  libxml2: Fix CVE-2017-9049 and CVE-2017-9050
  libxml2: Fix CVE-2017-5969
  libxml2: Fix CVE-2017-0663
  libxml2: Revert "Add an XML_PARSE_NOXXE flag to block all entities
loading even local"

 .../libxml/libxml2/CVE-2016-9318.patch | 207 
 .../libxml/libxml2/libxml2-CVE-2017-0663.patch |  40 ++
 .../libxml/libxml2/libxml2-CVE-2017-5969.patch |  62 +++
 .../libxml2-CVE-2017-9047_CVE-2017-9048.patch  | 103 
 .../libxml2-CVE-2017-9049_CVE-2017-9050.patch  | 291 ++
 ...ibxml2-fix_and_simplify_xmlParseStartTag2.patch | 590 +
 meta/recipes-core/libxml/libxml2/runtest.patch |  25 +-
 meta/recipes-core/libxml/libxml2_2.9.4.bb  |   6 +-
 8 files changed,  insertions(+), 213 deletions(-)
 delete mode 100644 meta/recipes-core/libxml/libxml2/CVE-2016-9318.patch
 create mode 100644 meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-0663.patch
 create mode 100644 meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-5969.patch
 create mode 100644 
meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-9047_CVE-2017-9048.patch
 create mode 100644 
meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-9049_CVE-2017-9050.patch
 create mode 100644 
meta/recipes-core/libxml/libxml2/libxml2-fix_and_simplify_xmlParseStartTag2.patch

-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v3 1/7] libxml2: Disable LeakSanitizer when running API tests

[Andrej Valek]

Makefile.am: Disable LeakSanitizer when running API tests

The autogenerated API tests leak memory.

Upstream-Status: Backported - 
[https://git.gnome.org/browse/libxml2/commit/?id=ac9a4560ee85b18811ff8ab7791ddfff7b144b0a]
Signed-off-by: Andrej Valek 
---
 meta/recipes-core/libxml/libxml2/runtest.patch | 25 -
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/libxml/libxml2/runtest.patch 
b/meta/recipes-core/libxml/libxml2/runtest.patch
index 397ab20..6e56857 100644
--- a/meta/recipes-core/libxml/libxml2/runtest.patch
+++ b/meta/recipes-core/libxml/libxml2/runtest.patch
@@ -2,12 +2,13 @@ Add 'install-ptest' rule.
 Print a standard result line for each test.
 
 Signed-off-by: Mihaela Sendrea 
-Upstream-Status: Pending
+Signed-off-by: Andrej Valek 
+Upstream-Status: Backport
 
 diff -uNr a/Makefile.am b/Makefile.am
 a/Makefile.am  2013-04-17 14:51:42.633386477 +0200
-+++ b/Makefile.am  2013-04-19 14:47:51.544720568 +0200
-@@ -202,10 +202,19 @@
+--- a/Makefile.am  2016-05-22 03:49:02.0 +0200
 b/Makefile.am  2017-06-14 10:38:43.381305385 +0200
+@@ -202,10 +202,24 @@
  #testOOM_DEPENDENCIES = $(DEPS)
  #testOOM_LDADD= $(LDADDS)
  
@@ -24,10 +25,24 @@ diff -uNr a/Makefile.am b/Makefile.am
[ -d test   ] || $(LN_S) $(srcdir)/test   .
[ -d result ] || $(LN_S) $(srcdir)/result .
 -  $(CHECKER) ./runtest$(EXEEXT) && $(CHECKER) ./testrecurse$(EXEEXT) 
&&$(CHECKER) ./testapi$(EXEEXT) && $(CHECKER) ./testchar$(EXEEXT)&& $(CHECKER) 
./testdict$(EXEEXT) && $(CHECKER) ./runxmlconf$(EXEEXT)
-+  ./runtest$(EXEEXT) ; ./testrecurse$(EXEEXT) ; ./testapi$(EXEEXT) ; 
./testchar$(EXEEXT) ; ./testdict$(EXEEXT) ; ./runxmlconf$(EXEEXT)
++  $(CHECKER) ./runtest$(EXEEXT) && \
++  $(CHECKER) ./testrecurse$(EXEEXT) && \
++  ASAN_OPTIONS="$$ASAN_OPTIONS:detect_leaks=0" $(CHECKER) 
./testapi$(EXEEXT) && \
++  $(CHECKER) ./testchar$(EXEEXT) && \
++  $(CHECKER) ./testdict$(EXEEXT) && \
++  $(CHECKER) ./runxmlconf$(EXEEXT)
@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \
$(MAKE) tests ; fi)
  
+@@ -229,7 +243,7 @@
+ 
+ APItests: testapi$(EXEEXT)
+   @echo "## Running the API regression tests this may take a little while"
+-  -@($(CHECKER) $(top_builddir)/testapi -q)
++  -@(ASAN_OPTIONS="$$ASAN_OPTIONS:detect_leaks=0" $(CHECKER) 
$(top_builddir)/testapi -q)
+ 
+ HTMLtests : testHTML$(EXEEXT)
+   @(echo > .memdump)
 diff -uNr a/runsuite.c b/runsuite.c
 --- a/runsuite.c   2013-04-12 16:17:11.462823238 +0200
 +++ b/runsuite.c   2013-04-17 14:07:24.352693211 +0200
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v3 3/7] libxml2: Fix CVE-2017-9047 and CVE-2017-9048

[Andrej Valek]

xmlSnprintfElementContent failed to correctly check the available
buffer space in two locations.

Fixes bug 781333 and bug 781701

CVE: CVE-2017-9047 CVE-2017-9048
Signed-off-by: Andrej Valek 
---
 .../libxml2-CVE-2017-9047_CVE-2017-9048.patch  | 103 +
 meta/recipes-core/libxml/libxml2_2.9.4.bb  |   1 +
 2 files changed, 104 insertions(+)
 create mode 100644 
meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-9047_CVE-2017-9048.patch

diff --git 
a/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-9047_CVE-2017-9048.patch 
b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-9047_CVE-2017-9048.patch
new file mode 100644
index 000..8b03456
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-9047_CVE-2017-9048.patch
@@ -0,0 +1,103 @@
+libxml2-2.9.4: Fix CVE-2017-9047 and CVE-2017-9048
+
+[No upstream tracking] -- https://bugzilla.gnome.org/show_bug.cgi?id=781333
+ -- https://bugzilla.gnome.org/show_bug.cgi?id=781701
+
+valid: Fix buffer size checks in xmlSnprintfElementContent
+
+xmlSnprintfElementContent failed to correctly check the available
+buffer space in two locations.
+
+Fixes bug 781333 and bug 781701
+
+Upstream-Status: Backport 
[https://git.gnome.org/browse/libxml2/commit/?id=932cc9896ab41475d4aa429c27d9afd175959d74]
+CVE: CVE-2017-9047 CVE-2017-9048
+Signed-off-by: Andrej Valek 
+
+diff --git a/result/valid/781333.xml b/result/valid/781333.xml
+new file mode 100644
+index 000..01baf11
+--- /dev/null
 b/result/valid/781333.xml
+@@ -0,0 +1,5 @@
++
++
++]>
++
+diff --git a/result/valid/781333.xml.err b/result/valid/781333.xml.err
+new file mode 100644
+index 000..2176200
+--- /dev/null
 b/result/valid/781333.xml.err
+@@ -0,0 +1,3 @@
++./test/valid/781333.xml:4: element a: validity error : Element a content does 
not follow the DTD, expecting ( ..., got 
++
++^
+diff --git a/result/valid/781333.xml.err.rdr b/result/valid/781333.xml.err.rdr
+new file mode 100644
+index 000..1195a04
+--- /dev/null
 b/result/valid/781333.xml.err.rdr
+@@ -0,0 +1,6 @@
++./test/valid/781333.xml:4: element a: validity error : Element a content does 
not follow the DTD, expecting ( ..., got 
++
++^
++./test/valid/781333.xml:5: element a: validity error : Element a content does 
not follow the DTD, Expecting more child
++
++^
+diff --git a/test/valid/781333.xml b/test/valid/781333.xml
+new file mode 100644
+index 000..bceac9c
+--- /dev/null
 b/test/valid/781333.xml
+@@ -0,0 +1,4 @@
++
++]>
++
+diff --git a/valid.c b/valid.c
+index 19f84b8..aaa30f6 100644
+--- a/valid.c
 b/valid.c
+@@ -1262,22 +1262,23 @@ xmlSnprintfElementContent(char *buf, int size, 
xmlElementContentPtr content, int
+ case XML_ELEMENT_CONTENT_PCDATA:
+ strcat(buf, "#PCDATA");
+   break;
+-  case XML_ELEMENT_CONTENT_ELEMENT:
++  case XML_ELEMENT_CONTENT_ELEMENT: {
++int qnameLen = xmlStrlen(content->name);
++
++  if (content->prefix != NULL)
++qnameLen += xmlStrlen(content->prefix) + 1;
++  if (size - len < qnameLen + 10) {
++  strcat(buf, " ...");
++  return;
++  }
+   if (content->prefix != NULL) {
+-  if (size - len < xmlStrlen(content->prefix) + 10) {
+-  strcat(buf, " ...");
+-  return;
+-  }
+   strcat(buf, (char *) content->prefix);
+   strcat(buf, ":");
+   }
+-  if (size - len < xmlStrlen(content->name) + 10) {
+-  strcat(buf, " ...");
+-  return;
+-  }
+   if (content->name != NULL)
+   strcat(buf, (char *) content->name);
+   break;
++  }
+   case XML_ELEMENT_CONTENT_SEQ:
+   if ((content->c1->type == XML_ELEMENT_CONTENT_OR) ||
+   (content->c1->type == XML_ELEMENT_CONTENT_SEQ))
+@@ -1319,6 +1320,7 @@ xmlSnprintfElementContent(char *buf, int size, 
xmlElementContentPtr content, int
+   xmlSnprintfElementContent(buf, size, content->c2, 0);
+   break;
+ }
++if (size - strlen(buf) <= 2) return;
+ if (englob)
+ strcat(buf, ")");
+ switch (content->ocur) {
diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb 
b/meta/recipes-core/libxml/libxml2_2.9.4.bb
index 0577ad6..dd2e034 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.4.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb
@@ -24,6 +24,7 @@ SRC_URI = 
"ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \
file://libxml2-CVE-2016-4658.patch \
file://libxml2-fix_NULL_pointer_derefs.patch \
file://libxml2-fix_and_simplify_xmlParseStartTag2.patch \
+   file://libxml2-CVE-2017-9047_CVE-2017-9048.patch \
file://CVE-2016-9318.patch \

file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \
"
-- 
2.1.4

-- 

[OE-core] [PATCH v3 2/7] libxml2: Avoid reparsing and simplify control flow in xmlParseStartTag2

[Andrej Valek]

Signed-off-by: Andrej Valek 
---
 ...ibxml2-fix_and_simplify_xmlParseStartTag2.patch | 590 +
 meta/recipes-core/libxml/libxml2_2.9.4.bb  |   1 +
 2 files changed, 591 insertions(+)
 create mode 100644 
meta/recipes-core/libxml/libxml2/libxml2-fix_and_simplify_xmlParseStartTag2.patch

diff --git 
a/meta/recipes-core/libxml/libxml2/libxml2-fix_and_simplify_xmlParseStartTag2.patch
 
b/meta/recipes-core/libxml/libxml2/libxml2-fix_and_simplify_xmlParseStartTag2.patch
new file mode 100644
index 000..faa5770
--- /dev/null
+++ 
b/meta/recipes-core/libxml/libxml2/libxml2-fix_and_simplify_xmlParseStartTag2.patch
@@ -0,0 +1,590 @@
+libxml2-2.9.4: Avoid reparsing and simplify control flow in xmlParseStartTag2
+
+[No upstream tracking]
+
+parser: Avoid reparsing in xmlParseStartTag2
+
+The code in xmlParseStartTag2 must handle the case that the input
+buffer was grown and reallocated which can invalidate pointers to
+attribute values. Before, this was handled by detecting changes of
+the input buffer "base" pointer and, in case of a change, jumping
+back to the beginning of the function and reparsing the start tag.
+
+The major problem of this approach is that whether an input buffer is
+reallocated is nondeterministic, resulting in seemingly random test
+failures. See the mailing list thread "runtest mystery bug: name2.xml
+error case regression test" from 2012, for example.
+
+If a reallocation was detected, the code also made no attempts to
+continue parsing in case of errors which makes a difference in
+the lax "recover" mode.
+
+Now we store the current input buffer "base" pointer for each (not
+separately allocated) attribute in the namespace URI field, which isn't
+used until later. After the whole start tag was parsed, the pointers to
+the attribute values are reconstructed using the offset between the
+new and the old input buffer. This relies on arithmetic on dangling
+pointers which is technically undefined behavior. But it seems like
+the easiest and most efficient fix and a similar approach is used in
+xmlParserInputGrow.
+
+This changes the error output of several tests, typically making it
+more verbose because we try harder to continue parsing in case of errors.
+
+(Another possible solution is to check not only the "base" pointer
+but the size of the input buffer as well. But this would result in
+even more reparsing.)
+
+Remove some goto labels and deduplicate a bit of code after handling
+namespaces.
+
+There were two bugs where parameter-entity references could lead to an
+unexpected change of the input buffer in xmlParseNameComplex and
+xmlDictLookup being called with an invalid pointer.
+
+
+Upstream-Status: Backport
+ - 
[https://git.gnome.org/browse/libxml2/commit/?id=07b7428b69c368611d215a140fe630b2d1e61349]
+ - 
[https://git.gnome.org/browse/libxml2/commit/?id=855c19efb7cd30d927d673b3658563c4959ca6f0]
+Signed-off-by: Andrej Valek 
+
+diff --git a/parser.c b/parser.c
+index 609a270..74016e3 100644
+--- a/parser.c
 b/parser.c
+@@ -43,6 +43,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -9377,8 +9378,7 @@ xmlParseStartTag2(xmlParserCtxtPtr ctxt, const xmlChar 
**pref,
+ const xmlChar **atts = ctxt->atts;
+ int maxatts = ctxt->maxatts;
+ int nratts, nbatts, nbdef;
+-int i, j, nbNs, attval, oldline, oldcol, inputNr;
+-const xmlChar *base;
++int i, j, nbNs, attval;
+ unsigned long cur;
+ int nsNr = ctxt->nsNr;
+ 
+@@ -9392,13 +9392,8 @@ xmlParseStartTag2(xmlParserCtxtPtr ctxt, const xmlChar 
**pref,
+  *   The Shrinking is only possible once the full set of attribute
+  *   callbacks have been done.
+  */
+-reparse:
+ SHRINK;
+-base = ctxt->input->base;
+ cur = ctxt->input->cur - ctxt->input->base;
+-inputNr = ctxt->inputNr;
+-oldline = ctxt->input->line;
+-oldcol = ctxt->input->col;
+ nbatts = 0;
+ nratts = 0;
+ nbdef = 0;
+@@ -9422,8 +9417,6 @@ reparse:
+  */
+ SKIP_BLANKS;
+ GROW;
+-if ((ctxt->input->base != base) || (inputNr != ctxt->inputNr))
+-goto base_changed;
+ 
+ while (((RAW != '>') &&
+  ((RAW != '/') || (NXT(1) != '>')) &&
+@@ -9434,203 +9427,174 @@ reparse:
+ 
+   attname = xmlParseAttribute2(ctxt, prefix, localname,
+, , , );
+-  if ((ctxt->input->base != base) || (inputNr != ctxt->inputNr)) {
+-  if ((attvalue != NULL) && (alloc != 0))
+-  xmlFree(attvalue);
+-  attvalue = NULL;
+-  goto base_changed;
+-  }
+-if ((attname != NULL) && (attvalue != NULL)) {
+-  if (len < 0) len = xmlStrlen(attvalue);
+-if ((attname == ctxt->str_xmlns) && (aprefix == NULL)) {
+-  const xmlChar *URL = xmlDictLookup(ctxt->dict, attvalue, len);
+-  xmlURIPtr uri;
+-
+-if (URL == NULL) {
+-   

[OE-core] [PATCH v3 5/7] libxml2: Fix CVE-2017-5969

[Andrej Valek]

Fix NULL pointer deref in xmlDumpElementContent

Can only be triggered in recovery mode.

Fixes bug 758422

CVE: CVE-2017-5969
Signed-off-by: Andrej Valek 
---
 .../libxml/libxml2/libxml2-CVE-2017-5969.patch | 62 ++
 meta/recipes-core/libxml/libxml2_2.9.4.bb  |  1 +
 2 files changed, 63 insertions(+)
 create mode 100644 meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-5969.patch

diff --git a/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-5969.patch 
b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-5969.patch
new file mode 100644
index 000..571b05c
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-5969.patch
@@ -0,0 +1,62 @@
+libxml2-2.9.4: Fix CVE-2017-5969
+
+[No upstream tracking] -- https://bugzilla.gnome.org/show_bug.cgi?id=758422
+
+valid: Fix NULL pointer deref in xmlDumpElementContent
+
+Can only be triggered in recovery mode.
+
+Fixes bug 758422
+
+Upstream-Status: Backport - 
[https://git.gnome.org/browse/libxml2/commit/?id=94691dc884d1a8ada39f073408b4bb92fe7fe882]
+CVE: CVE-2017-5969
+Signed-off-by: Andrej Valek 
+
+diff --git a/valid.c b/valid.c
+index 19f84b8..0a8e58a 100644
+--- a/valid.c
 b/valid.c
+@@ -1172,29 +1172,33 @@ xmlDumpElementContent(xmlBufferPtr buf, 
xmlElementContentPtr content, int glob)
+   xmlBufferWriteCHAR(buf, content->name);
+   break;
+   case XML_ELEMENT_CONTENT_SEQ:
+-  if ((content->c1->type == XML_ELEMENT_CONTENT_OR) ||
+-  (content->c1->type == XML_ELEMENT_CONTENT_SEQ))
++  if ((content->c1 != NULL) &&
++  ((content->c1->type == XML_ELEMENT_CONTENT_OR) ||
++   (content->c1->type == XML_ELEMENT_CONTENT_SEQ)))
+   xmlDumpElementContent(buf, content->c1, 1);
+   else
+   xmlDumpElementContent(buf, content->c1, 0);
+ xmlBufferWriteChar(buf, " , ");
+-  if ((content->c2->type == XML_ELEMENT_CONTENT_OR) ||
+-  ((content->c2->type == XML_ELEMENT_CONTENT_SEQ) &&
+-   (content->c2->ocur != XML_ELEMENT_CONTENT_ONCE)))
++  if ((content->c2 != NULL) &&
++  ((content->c2->type == XML_ELEMENT_CONTENT_OR) ||
++   ((content->c2->type == XML_ELEMENT_CONTENT_SEQ) &&
++(content->c2->ocur != XML_ELEMENT_CONTENT_ONCE
+   xmlDumpElementContent(buf, content->c2, 1);
+   else
+   xmlDumpElementContent(buf, content->c2, 0);
+   break;
+   case XML_ELEMENT_CONTENT_OR:
+-  if ((content->c1->type == XML_ELEMENT_CONTENT_OR) ||
+-  (content->c1->type == XML_ELEMENT_CONTENT_SEQ))
++  if ((content->c1 != NULL) &&
++  ((content->c1->type == XML_ELEMENT_CONTENT_OR) ||
++   (content->c1->type == XML_ELEMENT_CONTENT_SEQ)))
+   xmlDumpElementContent(buf, content->c1, 1);
+   else
+   xmlDumpElementContent(buf, content->c1, 0);
+ xmlBufferWriteChar(buf, " | ");
+-  if ((content->c2->type == XML_ELEMENT_CONTENT_SEQ) ||
+-  ((content->c2->type == XML_ELEMENT_CONTENT_OR) &&
+-   (content->c2->ocur != XML_ELEMENT_CONTENT_ONCE)))
++  if ((content->c2 != NULL) &&
++  ((content->c2->type == XML_ELEMENT_CONTENT_SEQ) ||
++   ((content->c2->type == XML_ELEMENT_CONTENT_OR) &&
++(content->c2->ocur != XML_ELEMENT_CONTENT_ONCE
+   xmlDumpElementContent(buf, content->c2, 1);
+   else
+   xmlDumpElementContent(buf, content->c2, 0);
diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb 
b/meta/recipes-core/libxml/libxml2_2.9.4.bb
index 3f78c2d..2996809 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.4.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb
@@ -26,6 +26,7 @@ SRC_URI = 
"ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \
file://libxml2-fix_and_simplify_xmlParseStartTag2.patch \
file://libxml2-CVE-2017-9047_CVE-2017-9048.patch \
file://libxml2-CVE-2017-9049_CVE-2017-9050.patch \
+   file://libxml2-CVE-2017-5969.patch \
file://CVE-2016-9318.patch \

file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \
"
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] image_types.bbclass: get rid of IMAGE_DEPENDS

[Ed Bartosh]

The IMAGE_DEPENDS variable can be overriden to add dependencies for
individual image types.  Those dependencies are added to the do_rootfs
task, while they really should be added to the specific image type tasks.

Also, the IMAGE_DEPENDS variable is not documented anywhere.

Replaced usage of IMAGE_DEPENDS with explicitly added
dependencies to do_image_ tasks.

[YOCTO #11302]

Signed-off-by: Ed Bartosh 
---
 meta/classes/image_types.bbclass | 36 ++--
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 7749b00..ea55c05 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -29,12 +29,6 @@ def imagetypes_getdepends(d):
 deps = set()
 for typestring in fstypes:
 basetype, resttypes = split_types(typestring)
-adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype) , deps)
-
-for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype) or 
"").split():
-base, rest = split_types(typedepends)
-adddep(d.getVar('IMAGE_DEPENDS_%s' % base) , deps)
-resttypes += rest
 
 for ctype in resttypes:
 adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype), deps)
@@ -101,7 +95,7 @@ IMAGE_CMD_squashfs-lzo = "mksquashfs ${IMAGE_ROOTFS} 
${IMGDEPLOYDIR}/${IMAGE_NAM
 # you need special parameters (like --xattrs) which are only supported
 # by GNU tar upstream >= 1.27, then override that default:
 # IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*"
-# IMAGE_DEPENDS_tar_append = " tar-replacement-native"
+# do_image_tar[depends] += "tar-replacement-native:do_populate_sysroot"
 # EXTRANATIVEPATH += "tar-native"
 #
 # The GNU documentation does not specify whether --xattrs-include is necessary.
@@ -209,21 +203,19 @@ EXTRA_IMAGECMD_ext4 ?= "-i 4096"
 EXTRA_IMAGECMD_btrfs ?= "-n 4096"
 EXTRA_IMAGECMD_elf ?= ""
 
-IMAGE_DEPENDS = ""
-IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
-IMAGE_DEPENDS_cramfs = "util-linux-native"
-IMAGE_DEPENDS_ext2 = "e2fsprogs-native"
-IMAGE_DEPENDS_ext3 = "e2fsprogs-native"
-IMAGE_DEPENDS_ext4 = "e2fsprogs-native"
-IMAGE_DEPENDS_btrfs = "btrfs-tools-native"
-IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
-IMAGE_DEPENDS_squashfs-xz = "squashfs-tools-native"
-IMAGE_DEPENDS_squashfs-lzo = "squashfs-tools-native"
-IMAGE_DEPENDS_elf = "virtual/kernel mkelfimage-native"
-IMAGE_DEPENDS_ubi = "mtd-utils-native"
-IMAGE_DEPENDS_ubifs = "mtd-utils-native"
-IMAGE_DEPENDS_multiubi = "mtd-utils-native"
-IMAGE_DEPENDS_wic = "parted-native"
+do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot"
+do_image_cramfs[depends] += "util-linux-native:do_populate_sysroot"
+do_image_ext2[depends] += "e2fsprogs-native:do_populate_sysroot"
+do_image_ext3[depends] += "e2fsprogs-native:do_populate_sysroot"
+do_image_ext4[depends] += "e2fsprogs-native:do_populate_sysroot"
+do_image_btrfs[depends] += "btrfs-tools-native:do_populate_sysroot"
+do_image_squashfs[depends] += "squashfs-tools-native:do_populate_sysroot"
+do_image_squashfs-xz[depends] += "squashfs-tools-native:do_populate_sysroot"
+do_image_squashfs-lzo[depends] += "squashfs-tools-native:do_populate_sysroot"
+do_image_elf[depends] += "virtual/kernel-native:do_populate_sysroot 
mkelfimage-native:do_populate_sysroot"
+do_image_ubi[depends] += "mtd-utils-native:do_populate_sysroot"
+do_image_ubifs[depends] += "mtd-utils-native:do_populate_sysroot"
+do_image_multiubi[depends] += "mtd-utils-native:do_populate_sysroot"
 
 # This variable is available to request which values are suitable for 
IMAGE_FSTYPES
 IMAGE_TYPES = " \
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2 1/7] libxml2: Disable LeakSanitizer when running API tests

[Burton, Ross]

On 15 June 2017 at 12:42, Andrej Valek  wrote:

> I am modifying already existing patch not creating the new one. Is it
> necessary to change Upstream-Status to backported?
>
> If yes, is it possible to fix only this patch, or do I need to push the
> whole series?
>

If the patch is backported from upstream then please correct the status to
be backported, and remove the U-S from the commit message.

Also a later patch in the series uses "Backported" when the status is
Backport, please verify that all the patches have the right tags as there
are scripts which read the values.

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH resend] qemuboot.conf: make cpus match built artifacts

[Burton, Ross]

On 2 May 2017 at 20:20, Martin Kelly  wrote:

> -QB_CPU_KVM_x86-64 = "-cpu kvm64"
> +QB_CPU_KVM_x86-64 = "-cpu core2duo"
>

What's the actual meaning of the "kvm64" and "kvm32" CPUs?  Is there a
performance hit?  Should we be instead changing the qemu machine to target
a different instruction set?

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2 1/7] libxml2: Disable LeakSanitizer when running API tests

[Andrej Valek]

I am modifying already existing patch not creating the new one. Is it
necessary to change Upstream-Status to backported?

If yes, is it possible to fix only this patch, or do I need to push the
whole series?

Andrej

On 06/15/2017 01:31 PM, Burton, Ross wrote:
> 
> On 15 June 2017 at 07:34, Andrej Valek  > wrote:
> 
> Upstream-Status: Backported -
> 
> [https://git.gnome.org/browse/libxml2/commit/?id=ac9a4560ee85b18811ff8ab7791ddfff7b144b0a
> 
> ]
> 
> 
> --- a/meta/recipes-core/libxml/libxml2/runtest.patch
> +++ b/meta/recipes-core/libxml/libxml2/runtest.patch
> @@ -5,9 +5,9 @@ Signed-off-by: Mihaela Sendrea  >
>   Upstream-Status: Pending
> 
> 
> Upstream-Status goes into the path file itself, not the commit log.
> 
> Ross
> 
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2 1/7] libxml2: Disable LeakSanitizer when running API tests

[Burton, Ross]

On 15 June 2017 at 07:34, Andrej Valek  wrote:

> Upstream-Status: Backported - [https://git.gnome.org/browse/
> libxml2/commit/?id=ac9a4560ee85b18811ff8ab7791ddfff7b144b0a]
>



> --- a/meta/recipes-core/libxml/libxml2/runtest.patch
> +++ b/meta/recipes-core/libxml/libxml2/runtest.patch
> @@ -5,9 +5,9 @@ Signed-off-by: Mihaela Sendrea 
>  Upstream-Status: Pending
>

Upstream-Status goes into the path file itself, not the commit log.

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core