[OE-core] [PATCH 1/2] patch: fix CVE-2018-6951
From: Jackie Huang * CVE detail: https://nvd.nist.gov/vuln/detail/CVE-2018-6951 * upstream tracking: http://savannah.gnu.org/bugs/?53132 * Fix segfault with mangled rename patch - src/pch.c (intuit_diff_type): Ensure that two filenames are specified for renames and copies (fix the existing check). Signed-off-by: Jackie Huang --- ...02-Fix-segfault-with-mangled-rename-patch.patch | 35 ++ meta/recipes-devtools/patch/patch_2.7.6.bb | 4 ++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch diff --git a/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch b/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch new file mode 100644 index 00..b0bd6fa83a --- /dev/null +++ b/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch @@ -0,0 +1,35 @@ +From f290f48a621867084884bfff87f8093c15195e6a Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Mon, 12 Feb 2018 16:48:24 +0100 +Subject: [PATCH] Fix segfault with mangled rename patch + +http://savannah.gnu.org/bugs/?53132 +* src/pch.c (intuit_diff_type): Ensure that two filenames are specified +for renames and copies (fix the existing check). + +Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f290f48a621867084884bfff87f8093c15195e6a] +CVE: CVE-2018-6951 + +Signed-off-by: Jackie Huang + +--- + src/pch.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/pch.c b/src/pch.c +index ff9ed2c..bc6278c 100644 +--- a/src/pch.c b/src/pch.c +@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type) + if ((pch_rename () || pch_copy ()) + && ! inname + && ! ((i == OLD || i == NEW) && +-p_name[! reverse] && ++p_name[reverse] && p_name[! reverse] && ++name_is_valid (p_name[reverse]) && + name_is_valid (p_name[! reverse]))) + { + say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy"); +-- +2.7.4 + diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb b/meta/recipes-devtools/patch/patch_2.7.6.bb index 576a2ac8fa..19ddf34981 100644 --- a/meta/recipes-devtools/patch/patch_2.7.6.bb +++ b/meta/recipes-devtools/patch/patch_2.7.6.bb @@ -1,7 +1,9 @@ require patch.inc LICENSE = "GPLv3" -SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch" +SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ +file://0002-Fix-segfault-with-mangled-rename-patch.patch \ +" SRC_URI[md5sum] = "4c68cee989d83c87b00a3860bcd05600" SRC_URI[sha256sum] = "8cf86e00ad3aaa6d26aca30640e86b0e3e1f395ed99f189b06d4c9f74bc58a4e" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] patch: fix CVE-2018-1000156
From: Jackie Huang * CVE detail: https://nvd.nist.gov/vuln/detail/CVE-2018-1000156 * upstream tracking: https://savannah.gnu.org/bugs/index.php?53566 * Fix arbitrary command execution in ed-style patches: - src/pch.c (do_ed_script): Write ed script to a temporary file instead of piping it to ed: this will cause ed to abort on invalid commands instead of rejecting them and carrying on. - tests/ed-style: New test case. - tests/Makefile.am (TESTS): Add test case. Signed-off-by: Jackie Huang --- ...-files-to-be-missing-for-ed-style-patches.patch | 38 ...ry-command-execution-in-ed-style-patches-.patch | 215 + meta/recipes-devtools/patch/patch_2.7.6.bb | 2 + 3 files changed, 255 insertions(+) create mode 100644 meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch create mode 100644 meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch diff --git a/meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch b/meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch new file mode 100644 index 00..2a09d0c03b --- /dev/null +++ b/meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch @@ -0,0 +1,38 @@ +From b5a91a01e5d0897facdd0f49d64b76b0f02b43e1 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Fri, 6 Apr 2018 11:34:51 +0200 +Subject: [PATCH] Allow input files to be missing for ed-style patches + +* src/pch.c (do_ed_script): Allow input files to be missing so that new +files will be created as with non-ed-style patches. + +Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/patch.git/commit/?id=b5a91a01e5d0897facdd0f49d64b76b0f02b43e1] +CVE: CVE-2018-1000156 + +Signed-off-by: Jackie Huang +--- + src/pch.c | 8 +--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/pch.c b/src/pch.c +index bc6278c..0c5cc26 100644 +--- a/src/pch.c b/src/pch.c +@@ -2394,9 +2394,11 @@ do_ed_script (char const *inname, char const *outname, + + if (! dry_run && ! skip_rest_of_patch) { + int exclusive = *outname_needs_removal ? 0 : O_EXCL; +- assert (! inerrno); +- *outname_needs_removal = true; +- copy_file (inname, outname, 0, exclusive, instat.st_mode, true); ++ if (inerrno != ENOENT) ++{ ++ *outname_needs_removal = true; ++ copy_file (inname, outname, 0, exclusive, instat.st_mode, true); ++} + sprintf (buf, "%s %s%s", editor_program, +verbosity == VERBOSE ? "" : "- ", +outname); +-- +2.7.4 + diff --git a/meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch b/meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch new file mode 100644 index 00..d74c2f182e --- /dev/null +++ b/meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch @@ -0,0 +1,215 @@ +From 123eaff0d5d1aebe128295959435b9ca5909c26d Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Fri, 6 Apr 2018 12:14:49 +0200 +Subject: [PATCH] Fix arbitrary command execution in ed-style patches (CVE-2018-1000156) + +* src/pch.c (do_ed_script): Write ed script to a temporary file instead +of piping it to ed: this will cause ed to abort on invalid commands +instead of rejecting them and carrying on. +* tests/ed-style: New test case. +* tests/Makefile.am (TESTS): Add test case. + +Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/patch.git/commit/?id=123eaff0d5d1aebe128295959435b9ca5909c26d] +CVE: CVE-2018-1000156 + +Signed-off-by: Jackie Huang +--- + src/pch.c | 91 --- + tests/Makefile.am | 1 + + tests/ed-style| 41 + + 3 files changed, 108 insertions(+), 25 deletions(-) + create mode 100644 tests/ed-style + +diff --git a/src/pch.c b/src/pch.c +index 0c5cc26..4fd5a05 100644 +--- a/src/pch.c b/src/pch.c +@@ -33,6 +33,7 @@ + # include + #endif + #include ++#include + + #define INITHUNKMAX 125 /* initial dynamic allocation size */ + +@@ -2389,24 +2390,28 @@ do_ed_script (char const *inname, char const *outname, + static char const editor_program[] = EDITOR_PROGRAM; + + file_offset beginning_of_this_line; +-FILE *pipefp = 0; + size_t chars_read; ++FILE *tmpfp = 0; ++char const *tmpname; ++int tmpfd; ++pid_t pid; ++ ++if (! dry_run && ! skip_rest_of_patch) ++ { ++ /* Write ed script to a temporary file. This causes ed to abort on ++ invalid commands such as when line numbers or ranges exceed the ++ number of available lines. When ed reads from a pipe, it rejects ++ invalid commands and treats the next line as a ne
[OE-core] [PATCH 0/2] patch: fix CVE-2018-6951 and CVE-2018-1000156
From: Jackie Huang These are also needed for previous releases, so I think they should be backported to the branch for 2.5 and 2.4 as well. -- The following changes since commit 29f65bda6d2c9fea4adb125c4857ee64f9312b9f: nativesdk-glibc: Split glibc and libcrypt to use libxcrypt instead (2018-04-07 22:34:45 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_patch_CVEs_180411_0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_patch_CVEs_180411_0 Jackie Huang (2): patch: fix CVE-2018-6951 patch: fix CVE-2018-1000156 ...02-Fix-segfault-with-mangled-rename-patch.patch | 35 ...-files-to-be-missing-for-ed-style-patches.patch | 38 ...ry-command-execution-in-ed-style-patches-.patch | 215 + meta/recipes-devtools/patch/patch_2.7.6.bb | 6 +- 4 files changed, 293 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch create mode 100644 meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch create mode 100644 meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] distcc: update to 3.3
From: Jackie Huang * update to version 3.3 * Remove 0001-zeroconf-Include-fcntl.h.patch since it's included in v3.3 * Add update-distcc-symlinks into FILES. Signed-off-by: Jackie Huang --- .../distcc/{distcc_3.2.bb => distcc_3.3.bb}| 10 +--- .../files/0001-zeroconf-Include-fcntl.h.patch | 29 -- 2 files changed, 6 insertions(+), 33 deletions(-) rename meta/recipes-devtools/distcc/{distcc_3.2.bb => distcc_3.3.bb} (91%) delete mode 100644 meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb b/meta/recipes-devtools/distcc/distcc_3.3.bb similarity index 91% rename from meta/recipes-devtools/distcc/distcc_3.2.bb rename to meta/recipes-devtools/distcc/distcc_3.3.bb index b6da65a582a..a266e7dde9b 100644 --- a/meta/recipes-devtools/distcc/distcc_3.2.bb +++ b/meta/recipes-devtools/distcc/distcc_3.3.bb @@ -14,14 +14,15 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" RRECOMMENDS_${PN} = "avahi-daemon" -SRC_URI = "git://github.com/distcc/distcc.git;branch=${PV} \ +SRC_URI = "git://github.com/distcc/distcc.git;branch=master \ file://separatebuilddir.patch \ - file://0001-zeroconf-Include-fcntl.h.patch \ file://default \ file://distccmon-gnome.desktop \ file://distcc \ file://distcc.service" -SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c" + +SRCREV = "002e68b766ccd7ad05551e67d162b71a7a773d0d" + S = "${WORKDIR}/git" UPSTREAM_VERSION_UNKNOWN = "1" @@ -60,9 +61,10 @@ PACKAGES += "distcc-distmon-gnome" FILES_${PN} = " ${sysconfdir} \ ${bindir}/distcc \ -${bindir}/lsdistcc \ + ${bindir}/lsdistcc \ ${bindir}/distccd \ ${bindir}/distccmon-text \ + ${sbindir}/update-distcc-symlinks \ ${systemd_unitdir}/system/distcc.service" FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ ${datadir}/distcc" diff --git a/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch b/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch deleted file mode 100644 index b17ec9c9599..000 --- a/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8331fc4759d809512f404e7a27f817ad6d616450 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Apr 2015 18:00:33 -0700 -Subject: [PATCH] zeroconf: Include fcntl.h - -We need it for getting deinitions for O_* e.g. O_CREAT - -Upstream-Status: Pending - -Signed-off-by: Khem Raj - src/zeroconf.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/zeroconf.c b/src/zeroconf.c -index 414ddc4..31bd33f 100644 a/src/zeroconf.c -+++ b/src/zeroconf.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include - #include --- -2.1.4 - -- 2.13.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] e2fsprogs: only quiet debugfs for native package
From: Jackie Huang Many test cases expect the output of running commands for debugfs, the patch quiet-debugfs.patch suppress the output so ptest failed: | 292 tests succeeded 47 tests failed The patch was meant to suppress the output in do_rootfs according to the original commit: == commit 13a8d3869b0fe0ebdddcee37fb48c5b9cdf718ba Author: Ross Burton Date: Mon Dec 23 13:38:34 2013 + e2fsprogs: silence debugfs debugfs echos the commands when it is executing a script, but as the scripts used at rootfs time are long this massively inflates the do_rootfs log. Comment out the echo so that the rootfs isn't 20K lines longer than it needs to be. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie == So only apply the patch for native package, then the ptest will be pass for target package. Signed-off-by: Jackie Huang --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb index b5cfc6810b..a53585db47 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb @@ -1,7 +1,6 @@ require e2fsprogs.inc SRC_URI += "file://remove.ldconfig.call.patch \ -file://quiet-debugfs.patch \ file://run-ptest \ file://ptest.patch \ file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \ @@ -10,7 +9,9 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch \ " -SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch" +SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ +file://quiet-debugfs.patch \ +" SRCREV = "af2eac481cf426c05ae12b946396980e16c8ab19" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+(\.\d+)*)$" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] e2fsprogs: fix the hardcoded paths for ptest
From: Jackie Huang Fix the hardcoded paths in test scripts and expect files to avoid issue like: | cat: ../e2fsck/e2fsck: No such file or directory Signed-off-by: Jackie Huang --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb index a53585db47..ceaf171585 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb @@ -104,7 +104,9 @@ do_compile_ptest() { do_install_ptest() { cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test - sed -e 's!../e2fsck/e2fsck!e2fsck!g' -i ${D}${PTEST_PATH}/test/*/expect* + sed -e 's!../e2fsck/e2fsck!e2fsck!g' \ + -e 's!../misc/tune2fs!tune2fs!g' -i ${D}${PTEST_PATH}/test/*/expect* + sed -e 's!../e2fsck/e2fsck!${base_sbindir}/e2fsck!g' -i ${D}${PTEST_PATH}/test/*/script # Remove various files find "${D}${PTEST_PATH}" -type f \ -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] e2fsprogs: fixes for ptest
From: Jackie Huang -- The following changes since commit 385944254d0ef88bd6450a221a54cbcb40020b42: tcmode-default.inc: drop preferred version of gzip-native (2018-01-31 17:01:20 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_e2fsprogs-ptest_180202_0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_e2fsprogs-ptest_180202_0 Jackie Huang (2): e2fsprogs: only quiet debugfs for native package e2fsprogs: fix the hardcoded paths for ptest meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] opkg-utils: fix the sed pattern in update-alternatives
From: Jackie Huang '\>' is to matches the end of a word, but the executable is not always a 'word', e.g. /usr/lib64/busybox/usr/bin/[ then such alternatives can not be removed. So change to use '\s' in the pattern since the following character of the $path is whitespace. Signed-off-by: Jackie Huang --- ...ternatives-remove_alt-fix-the-sed-pattern.patch | 36 ++ .../opkg-utils/opkg-utils_0.3.5.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/update-alternatives-remove_alt-fix-the-sed-pattern.patch diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/update-alternatives-remove_alt-fix-the-sed-pattern.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/update-alternatives-remove_alt-fix-the-sed-pattern.patch new file mode 100644 index 00..cca07a7d5b --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/update-alternatives-remove_alt-fix-the-sed-pattern.patch @@ -0,0 +1,36 @@ +From e8b8880a281ccb0082f6cad63eb253b921f31fef Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Thu, 18 Jan 2018 17:57:08 -0800 +Subject: [PATCH] update-alternatives: fix the sed pattern in remove_alt + +'\>' is to matches the end of a word, but the executable is +not always a 'word', e.g. /usr/lib64/busybox/usr/bin/[ + +then such alternatives can not be removed. + +So change to use '\s' in the pattern since the following +character of the $path is whitespace. + +Upstream-Status: Submitted [yo...@yoctoproject.org, opkg-de...@googlegroups.com] + +Signed-off-by: Jackie Huang +--- + update-alternatives | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/update-alternatives b/update-alternatives +index ffad853..ce7d66c 100644 +--- a/update-alternatives b/update-alternatives +@@ -80,7 +80,7 @@ remove_alt() { + [ ! -f $ad/$name ] && return 0 + + path=`echo $path | protect_slashes | protect_special_character` +- sed -ne "/^$path\>.*/!p" $ad/$name > $ad/$name.new ++ sed -ne "/^$path\s.*/!p" $ad/$name > $ad/$name.new + mv $ad/$name.new $ad/$name + } + +-- +2.7.4 + diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb index 514ba7912a..53b69efe55 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb @@ -9,6 +9,7 @@ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtu SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ file://0001-Switch-all-scripts-to-use-Python-3.x.patch \ + file://update-alternatives-remove_alt-fix-the-sed-pattern.patch \ " SRC_URI_append_class-native = " file://tar_ignore_error.patch" UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/"; -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1 v2] features_backfill: fix for multilib
From: Jackie Huang v2 comments: Rebase the patch -- The following changes since commit d7cf7d6d032158690d6503ddc2c20bc5cd614264: bitbake: bitbake-user-manual: Removed stray parenthesis (2018-01-16 20:38:58 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_feature_backfill_180117_0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_feature_backfill_180117_0 Jackie Huang (1): features_backfill: fix for multilib meta/classes/multilib.bbclass | 4 meta/lib/oe/utils.py | 9 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1 v2] features_backfill: fix for multilib
From: Jackie Huang The backfilling feature doesn't work for multilib, e.g. build with: MACHINE = "qemumips64" MULTILIB_GLOBAL_VARIANTS_append = " libn32" MULTILIBS = "multilib:libn32" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" require conf/multilib.conf And we have backfill_considered in machine/include/mips/arch-mips.inc: MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "${@bb.utils.contains('TUNE_FEATURES', 'n32', 'qemu-usermode', '', d)}" For libn32 builds, 'qemu-usermode' is not expected but it still presents in MACHINE_FEATURES. To fix the issue: * Change the oe.utils.features_backfill to always compare with the original features(before backfilled), so we can run the function multiple times when needed. * run oe.utils.features_backfill at the end of multilib_virtclass_handler to update the backfilled features to ensure it's correct for multilib. [YOCTO #12373] Signed-off-by: Jackie Huang --- meta/classes/multilib.bbclass | 4 meta/lib/oe/utils.py | 9 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index dc0868be3e..8e2cd57eec 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -76,6 +76,10 @@ python multilib_virtclass_handler () { newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False) if newtune: e.data.setVar("DEFAULTTUNE", newtune) + +# Update the backfilled features after DEFAULTTUNE changed +oe.utils.features_backfill("DISTRO_FEATURES", e.data) +oe.utils.features_backfill("MACHINE_FEATURES", e.data) } addhandler multilib_virtclass_handler diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 7a79d752b6..b6c10424e7 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -107,13 +107,18 @@ def features_backfill(var,d): backfill = (d.getVar(var+"_BACKFILL") or "").split() considered = (d.getVar(var+"_BACKFILL_CONSIDERED") or "").split() +features_original = (d.getVar(var + "_ORIGINAL") or "").split() +if not features_original: +features_original = features +d.setVar(var + "_ORIGINAL", " ".join(features_original)) + addfeatures = [] for feature in backfill: -if feature not in features and feature not in considered: +if feature not in features_original and feature not in considered: addfeatures.append(feature) if addfeatures: -d.appendVar(var, " " + " ".join(addfeatures)) +d.setVar(var, " ".join(features_original) + " " + " ".join(addfeatures)) def all_distro_features(d, features, truevalue="1", falsevalue=""): """ -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] glibc: re-package for libnss-db
From: Jackie Huang On other distros like ubuntu/centos, libnss-db usually provides: - The libraries - The Makefile to create database (in /var/db for centos, /var/lib/misc/ for ubuntu) - The makedb command (it's in glibc-common for centos7) What we had is: - The libraries are in glibc-extra-nss - The Makefile is removed - The makedb command is in glibc-utils (lack of dependency) So when glibc-extra-nss is installed but glibc-utils is not, we see error like: nscd[165]: 165 checking for monitored file `/var/db/group.db': No such file or directory nscd[165]: 165 checking for monitored file `/var/db/passwd.db': No such file or directory And there is not an easy way to create these databases. To fix the issue: - Re-package the libraries into libnss-db - Don't remove the Makefile and add it in libnss-db - Add RDEPENDS on glibc-utils for libnss-db, and add RSUGGESTS on make since it's optional to generate the db with make. Notes: For external toolchain, an extra package 'libnss-db' need to be provided If replacing glibc from core. Signed-off-by: Jackie Huang --- meta/recipes-core/glibc/glibc-package.inc | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 817d850358..6ee33e61e6 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -1,6 +1,6 @@ INHIBIT_SYSROOT_STRIP = "1" -PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" +PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" # The ld.so in this glibc supports the GNU_HASH RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)" @@ -23,6 +23,9 @@ FILES_ldd = "${bindir}/ldd" FILES_libsegfault = "${base_libdir}/libSegFault*" FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" FILES_libmemusage = "${base_libdir}/libmemusage.so" +FILES_libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile" +RDEPENDS_libnss-db = "${PN}-utils" +RSUGGESTS_libnss-db = "make" FILES_glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" FILES_sln = "${base_sbindir}/sln" FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" @@ -59,7 +62,6 @@ inherit libc-common multilib_header do_install_append () { rm -f ${D}${sysconfdir}/localtime - rm -rf ${D}${localstatedir} # remove empty glibc dir if [ -d ${D}${libexecdir} ]; then -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1 v3] glibc: re-package for libnss-db
From: Jackie Huang v3 comments: Change the dependency on make to RSUGGESTS. -- The following changes since commit b9dcab772fd37ed8376a87d3194195e13ff52d10: qemu: CVE-2017-17381 (2018-01-14 09:11:58 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_nscd_v3_180116_0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_nscd_v3_180116_0 Jackie Huang (1): glibc: re-package for libnss-db meta/recipes-core/glibc/glibc-package.inc | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: add RDEPENDS on util-linux-getopt
From: Jackie Huang 'getopt' is needed by systemd-sysv-install, or it fails with: | kdump.service is not a native service, redirecting to systemd-sysv-install. | Executing: /lib/systemd/systemd-sysv-install enable kdump | /lib/systemd/systemd-sysv-install: line 15: getopt: command not found Signed-off-by: Jackie Huang --- meta/recipes-core/systemd/systemd_234.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb index 4132cdf40f..5a0e4c2247 100644 --- a/meta/recipes-core/systemd/systemd_234.bb +++ b/meta/recipes-core/systemd/systemd_234.bb @@ -521,7 +521,7 @@ FILES_${PN} = " ${base_bindir}/* \ FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" -RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV}) util-linux-agetty" +RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-getopt" RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" RDEPENDS_${PN} += "volatile-binds update-rc.d" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] rpcbind: Stop freeing a static pointer
From: Jackie Huang commit 7ea36ee introduced a svc_freeargs() call that ended up freeing static pointer. It turns out the allocations for the rmt_args is not necessary . The xdr routines (xdr_bytes) will handle the memory management and the largest possible message size is UDPMSGSIZE (due to UDP only) which is smaller than RPC_BUF_MAX Signed-off-by: Jackie Huang --- ..._callit_com-Stop-freeing-a-static-pointer.patch | 100 + meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb | 1 + 2 files changed, 101 insertions(+) create mode 100644 meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch b/meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch new file mode 100644 index 00..9a000d0285 --- /dev/null +++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch @@ -0,0 +1,100 @@ +From 7c7590ad536c0e24bef790cb1e65702fc54db566 Mon Sep 17 00:00:00 2001 +From: Steve Dickson +Date: Tue, 30 May 2017 11:27:22 -0400 +Subject: [PATCH] rpcbproc_callit_com: Stop freeing a static pointer + +commit 7ea36ee introduced a svc_freeargs() call +that ended up freeing static pointer. + +It turns out the allocations for the rmt_args +is not necessary . The xdr routines (xdr_bytes) will +handle the memory management and the largest +possible message size is UDPMSGSIZE (due to UDP only) +which is smaller than RPC_BUF_MAX + +Signed-off-by: Steve Dickson + +Upstream-Status: Backport + +Signed-off-by: Jackie Huang +--- + src/rpcb_svc_com.c | 39 ++- + 1 file changed, 6 insertions(+), 33 deletions(-) + +diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c +index cb63afd..1fc2229 100644 +--- a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c +@@ -612,9 +612,9 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp, + struct netconfig *nconf; + struct netbuf *caller; + struct r_rmtcall_args a; +- char *buf_alloc = NULL, *outbufp; ++ char *outbufp; + char *outbuf_alloc = NULL; +- char buf[RPC_BUF_MAX], outbuf[RPC_BUF_MAX]; ++ char outbuf[RPC_BUF_MAX]; + struct netbuf *na = (struct netbuf *) NULL; + struct rpc_msg call_msg; + int outlen; +@@ -635,36 +635,10 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp, + } + if (si.si_socktype != SOCK_DGRAM) + return; /* Only datagram type accepted */ +- sendsz = __rpc_get_t_size(si.si_af, si.si_proto, UDPMSGSIZE); +- if (sendsz == 0) { /* data transfer not supported */ +- if (reply_type == RPCBPROC_INDIRECT) +- svcerr_systemerr(transp); +- return; +- } +- /* +- * Should be multiple of 4 for XDR. +- */ +- sendsz = ((sendsz + 3) / 4) * 4; +- if (sendsz > RPC_BUF_MAX) { +-#ifdefnotyet +- buf_alloc = alloca(sendsz); /* not in IDR2? */ +-#else +- buf_alloc = malloc(sendsz); +-#endif/* notyet */ +- if (buf_alloc == NULL) { +- if (debugging) +- xlog(LOG_DEBUG, +- "rpcbproc_callit_com: No Memory!\n"); +- if (reply_type == RPCBPROC_INDIRECT) +- svcerr_systemerr(transp); +- return; +- } +- a.rmt_args.args = buf_alloc; +- } else { +- a.rmt_args.args = buf; +- } ++ sendsz = UDPMSGSIZE; + + call_msg.rm_xid = 0;/* For error checking purposes */ ++ memset(&a, 0, sizeof(a)); /* Zero out the input buffer */ + if (!svc_getargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) { + if (reply_type == RPCBPROC_INDIRECT) + svcerr_decode(transp); +@@ -704,7 +678,8 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp, + if (rbl == (rpcblist_ptr)NULL) { + #ifdef RPCBIND_DEBUG + if (debugging) +- xlog(LOG_DEBUG, "not found\n"); ++ xlog(LOG_DEBUG, "prog %lu vers %lu: not found\n", ++ a.rmt_prog, a.rmt_vers); + #endif + if (reply_type == RPCBPROC_INDIRECT) + svcerr_noprog(transp); +@@ -937,8 +912,6 @@ out: + } + if (local_uaddr) + free(local_uaddr); +- if (buf_alloc) +- free(buf_alloc); + if (outbuf_alloc) + free(outbuf_alloc); + if (na) { +-- +2.7.4 + diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb index d3eeaf94b6..dcdee6c468 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.
[OE-core] [PATCH 1/2] rpcbind: fix assertion failure
From: Jackie Huang Backport a patch to fix the assertion failure: rpcbind: ../../libtirpc-1.0.2/src/pmap_prot.c:50: xdr_pmap: Assertion `regs != NULL' failed. Signed-off-by: Jackie Huang --- ...proc_dump-Fixed-typo-in-memory-leak-patch.patch | 33 ++ meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch diff --git a/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch b/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch new file mode 100644 index 00..859e67bbe0 --- /dev/null +++ b/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch @@ -0,0 +1,33 @@ +From c49a7ea639eb700823e174fd605bbbe183e229aa Mon Sep 17 00:00:00 2001 +From: Steve Dickson +Date: Wed, 17 May 2017 10:52:25 -0400 +Subject: [PATCH] pmapproc_dump: Fixed typo in memory leak patch + +commit 7ea36eee introduce a typo that caused +NIS (aka ypbind) to fail. + +Signed-off-by: Steve Dickson + +Upstream-Status: Backport + +Signed-off-by: Jackie Huang +--- + src/pmap_svc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pmap_svc.c b/src/pmap_svc.c +index e926cdc..26c31d0 100644 +--- a/src/pmap_svc.c b/src/pmap_svc.c +@@ -384,7 +384,7 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt) + } + + done: +- if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)NULL)) { ++ if (!svc_freeargs(xprt, (xdrproc_t) xdr_void, (char *)NULL)) { + if (debugging) { + (void) xlog(LOG_DEBUG, "unable to free arguments\n"); + if (doabort) { +-- +2.7.4 + diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb index 60e46edd53..d3eeaf94b6 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb @@ -16,6 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ file://rpcbind.socket \ file://rpcbind.service \ file://0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch \ + file://pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch \ " SRC_URI[md5sum] = "cf10cd41ed8228fc54c316191c1f07fe" SRC_URI[sha256sum] = "074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] rpcbind: fix a freeing issue and an assertion failure
From: Jackie Huang -- The following changes since commit 205cfd702190026e64eed9cae27c05ff62d1637e: bitbake: fetch2/__init__: Disable pseudo in runfetchcmd() (2018-01-08 08:48:54 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_rpcbind_20180110_1 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_rpcbind_20180110_1 Jackie Huang (2): rpcbind: fix assertion failure rpcbind: Stop freeing a static pointer ...proc_dump-Fixed-typo-in-memory-leak-patch.patch | 33 +++ ..._callit_com-Stop-freeing-a-static-pointer.patch | 100 + meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb | 2 + 3 files changed, 135 insertions(+) create mode 100644 meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch create mode 100644 meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pulseaudio: change pulse to be a system group
From: Jackie Huang pulse is added as a system user, so the group 'pulse' is meant to be a system group as well, which is the same with other distros like ubuntu/centos. Signed-off-by: Jackie Huang --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index fdbf5abc16..8189a569e1 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -160,7 +160,7 @@ do_install_append() { } USERADD_PACKAGES = "pulseaudio-server" -GROUPADD_PARAM_pulseaudio-server = "pulse" +GROUPADD_PARAM_pulseaudio-server = "--system pulse" USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \ --no-create-home --shell /bin/false \ --groups audio,pulse --gid pulse pulse" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] features_backfill: fix for multilib
From: Jackie Huang The backfilling feature doesn't work for multilib, e.g. build with: MACHINE = "qemumips64" MULTILIB_GLOBAL_VARIANTS_append = " libn32" MULTILIBS = "multilib:libn32" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" require conf/multilib.conf And we have backfill_considered in machine/include/mips/arch-mips.inc: MACHINE_FEATURES_BACKFILL_CONSIDERED_append = "${@bb.utils.contains('TUNE_FEATURES', 'n32', 'qemu-usermode', '', d)}" For libn32 builds, 'qemu-usermode' is not expected but it still presents in MACHINE_FEATURES. To fix the issue: * Change the oe.utils.features_backfill to always compare with the original features(before backfilled), so we can run the function multiple times when needed. * run oe.utils.features_backfill at the end of multilib_virtclass_handler to update the backfilled features to ensure it's correct for multilib. [YOCTO #12373] Signed-off-by: Jackie Huang --- meta/classes/multilib.bbclass | 4 meta/lib/oe/utils.py | 9 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 816f54e..589ee37 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -77,6 +77,10 @@ python multilib_virtclass_handler () { if newtune: e.data.setVar("DEFAULTTUNE", newtune) e.data.setVar('DEFAULTTUNE_ML_%s' % variant, newtune) + +# Update the backfilled features after DEFAULTTUNE changed +oe.utils.features_backfill("DISTRO_FEATURES", e.data) +oe.utils.features_backfill("MACHINE_FEATURES", e.data) } addhandler multilib_virtclass_handler diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 1897c5f..371acd0 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -107,13 +107,18 @@ def features_backfill(var,d): backfill = (d.getVar(var+"_BACKFILL") or "").split() considered = (d.getVar(var+"_BACKFILL_CONSIDERED") or "").split() +features_original = (d.getVar(var + "_ORIGINAL") or "").split() +if not features_original: +features_original = features +d.setVar(var + "_ORIGINAL", " ".join(features_original)) + addfeatures = [] for feature in backfill: -if feature not in features and feature not in considered: +if feature not in features_original and feature not in considered: addfeatures.append(feature) if addfeatures: -d.appendVar(var, " " + " ".join(addfeatures)) +d.setVar(var, " ".join(features_original) + " " + " ".join(addfeatures)) def all_distro_features(d, features, truevalue="1", falsevalue=""): """ -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] features_backfill: fix for multilib
From: Jackie Huang Tested with: 1) local.conf: MACHINE = "qemumips64" MULTILIB_GLOBAL_VARIANTS_append = " libn32" MULTILIBS = "multilib:libn32" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" require conf/multilib.conf 2) run bitbake -e to check the features: $ bitbake -e libn32-gobject-introspection | grep '^MACHINE_FEATURES' (before the fix) MACHINE_FEATURES="alsa bluetooth usbgadget screen rtc qemu-usermode" MACHINE_FEATURES_BACKFILL="rtc qemu-usermode" MACHINE_FEATURES_BACKFILL_CONSIDERED=" qemu-usermode" (after the fix) MACHINE_FEATURES="alsa bluetooth usbgadget screen rtc" MACHINE_FEATURES_BACKFILL="rtc qemu-usermode" MACHINE_FEATURES_BACKFILL_CONSIDERED=" qemu-usermode" MACHINE_FEATURES_ORIGINAL="alsa bluetooth usbgadget screen" 3) world build: $ bitbake world builds without error. -- The following changes since commit 4469acdf1d0338220f3fe2ecb5e079eea6fda375: lib/oe/utils: remove param_bool() (2017-12-02 11:25:34 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_backfill_multilib_171207_0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_backfill_multilib_171207_0 Jackie Huang (1): features_backfill: fix for multilib meta/classes/multilib.bbclass | 4 meta/lib/oe/utils.py | 9 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glib-2.0: fix for non-utf8 encoded files
From: Jackie Huang Some source files aren't valid utf-8 containing for example iso8859-1 accented characters in author's names. Replace invalid data with a replacement '?' character and print a warning to keep things working. Signed-off-by: Jackie Huang --- .../glib-mkenums-replace-and-warn-decoding.patch | 104 + meta/recipes-core/glib-2.0/glib-2.0_2.54.2.bb | 1 + 2 files changed, 105 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib-mkenums-replace-and-warn-decoding.patch diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-mkenums-replace-and-warn-decoding.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-mkenums-replace-and-warn-decoding.patch new file mode 100644 index 000..a5dae7e9f46 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-mkenums-replace-and-warn-decoding.patch @@ -0,0 +1,104 @@ +From ba043ef4f2c713662f89425aed70dfd78e3955ee Mon Sep 17 00:00:00 2001 +From: Patrick Welche +Date: Mon, 23 Oct 2017 13:59:58 +0100 +Subject: [PATCH] glib-mkenums: best effort attempt on non-utf8 encoded files. + +Some source files aren't valid utf-8 containing for example +iso8859-1 accented characters in author's names. +Replace invalid data with a replacement '?' character and print a +warning to keep things working. +Based on a patch from Christoph Reiter in +https://bugzilla.gnome.org/show_bug.cgi?id=785113#c20 + +Upstream-Status: Submitted [https://bug785113.bugzilla-attachments.gnome.org/attachment.cgi?id=362098] + +Author: Patrick Welche + +Signed-off-by: Jackie Huang +--- + gobject/glib-mkenums.in | 41 ++--- + 1 file changed, 30 insertions(+), 11 deletions(-) + +diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in +index 7cc55053c..9790a65a2 100755 +--- a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in +@@ -26,14 +26,6 @@ the GNU General Public License which can be found in the + GLib source package. Sources, examples and contact + information are available at http://www.gtk.org''' + +-# Python 2 defaults to ASCII in case stdout is redirected. +-# This should make it match Python 3, which uses the locale encoding. +-if sys.stdout.encoding is None: +-output_stream = codecs.getwriter( +-locale.getpreferredencoding())(sys.stdout) +-else: +-output_stream = sys.stdout +- + # pylint: disable=too-few-public-methods + class Color: + '''ANSI Terminal colors''' +@@ -81,6 +73,31 @@ def write_output(output): + global output_stream + print(output, file=output_stream) + ++ ++# Python 2 defaults to ASCII in case stdout is redirected. ++# This should make it match Python 3, which uses the locale encoding. ++if sys.stdout.encoding is None: ++output_stream = codecs.getwriter( ++locale.getpreferredencoding())(sys.stdout) ++else: ++output_stream = sys.stdout ++ ++ ++# Some source files aren't utf-8 and the old perl version didn't care. ++# Replace invalid data with a replacement character to keep things working. ++# https://bugzilla.gnome.org/show_bug.cgi?id=785113#c20 ++decoding_errors = "replace_and_warn" ++ ++def replace_and_warn(err): ++# 7 characters of context either side of the offending character ++print_warning('UnicodeWarning: {} at {} ({})'.format( ++err.reason, err.start, ++err.object[err.start - 7:err.end + 7])) ++return ('?', err.end) ++ ++codecs.register_error('replace_and_warn', replace_and_warn) ++ ++ + # glib-mkenums.py + # Information about the current enumeration + flags = None # Is enumeration a bitmask? +@@ -157,7 +174,8 @@ def parse_entries(file, file_name): + m = re.match(r'\#include\s*<([^>]*)>', line) + if m: + newfilename = os.path.join("..", m.group(1)) +-newfile = io.open(newfilename, encoding="utf-8") ++newfile = io.open(newfilename, encoding="utf-8", ++ errors=decoding_errors) + + if not parse_entries(newfile, newfilename): + return False +@@ -253,7 +271,7 @@ def read_template_file(file): +} + in_ = 'junk' + +-ifile = io.open(file, encoding="utf-8") ++ifile = io.open(file, encoding="utf-8", errors=decoding_errors) + for line in ifile: + m = re.match(r'\/\*\*\*\s+(BEGIN|END)\s+([\w-]+)\s+\*\*\*\/', line) + if m: +@@ -408,7 +426,8 @@ def process_file(curfilename): + firstenum = True + + try: +-curfile = io.open(curfilename, encoding="utf-8") ++curfile = io.open(curfilename, encoding="utf-8", ++ errors=decoding_errors) + except IOError as e: + if e.errno == errno.ENOENT: + print_warning('No file "{}" found.'.format(curfilename)) +-- +2.14.2 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.54.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.54.2.bb index 60ce1b5f7fb..963f6b471df 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.54.2.bb +++ b/meta/recipes-cor
[OE-core] [PATCH] qemu: fix the makefile for ptest
From: Jackie Huang It always fail to check the file generated by configure when running ptest on the target since it's cross-compiling, so remove the check from the Makefile for ptest. Signed-off-by: Jackie Huang --- meta/recipes-devtools/qemu/qemu_2.10.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/qemu/qemu_2.10.1.bb b/meta/recipes-devtools/qemu/qemu_2.10.1.bb index 8e3ca3c949..5ac221c9ed 100644 --- a/meta/recipes-devtools/qemu/qemu_2.10.1.bb +++ b/meta/recipes-devtools/qemu/qemu_2.10.1.bb @@ -55,5 +55,8 @@ do_install_ptest() { find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcod]" | xargs -i rm -rf {} cp ${S}/tests/Makefile.include ${D}${PTEST_PATH}/tests + # Don't check the file genreated by configure + sed -i -e '/wildcard config-host.mak/d' \ + -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include } -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libnsl2: fix installed-vs-shipped QA issue
From: Jackie Huang Fix the installed-vs-shipped QA issue: | WARNING: libnsl2-1.0.5+gitAUTOINC+dfa2f31352-r0 do_package: QA Issue: libnsl2: Files/directories were installed but not shipped in any package: /usr/lib64/nsl/libnsl.a Signed-off-by: Jackie Huang --- meta/recipes-extended/libnsl/libnsl2_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/libnsl/libnsl2_git.bb b/meta/recipes-extended/libnsl/libnsl2_git.bb index 18e37a1..a539148 100644 --- a/meta/recipes-extended/libnsl/libnsl2_git.bb +++ b/meta/recipes-extended/libnsl/libnsl2_git.bb @@ -34,3 +34,4 @@ do_install_append() { FILES_${PN} += "${libdir}/nsl/*.so.*" FILES_${PN}-dev += "${includedir}/nsl ${libdir}/nsl/*.so" +FILES_${PN}-staticdev += "${libdir}/nsl/*.a" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2 v2] glibc: fixes for nscd and libnss-db
From: Jackie Huang v2 comments: Add a note for external toolchain in the commit log. -- The following changes since commit 514a808f21c37b6ad704ce397bb2740ecc9a93bc: ref-manual: Updates to "Image Generation" section. (2017-10-30 15:55:08 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_nscd_171102_0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_nscd_171102_0 Jackie Huang (2): glibc: re-package for libnss-db glibc/nscd: do not cache for netgroup by default meta/recipes-core/glibc/glibc-package.inc | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2 v2] glibc: re-package for libnss-db
From: Jackie Huang On other distros like ubuntu/centos, libnss-db usually provides: - The libraries - The Makefile to create database (in /var/db for centos, /var/lib/misc/ for ubuntu) - The makedb command (it's in glibc-common for centos7) What we had is: - The libraries are in glibc-extra-nss - The Makefile is removed - The makedb command is in glibc-utils (lack of dependency) So when glibc-extra-nss is installed but glibc-utils is not, we see error like: nscd[165]: 165 checking for monitored file `/var/db/group.db': No such file or directory nscd[165]: 165 checking for monitored file `/var/db/passwd.db': No such file or directory And there is not an easy way to create these databases. To fix the issue: - Re-package the libraries into libnss-db - Don't remove the Makefile and add it in libnss-db - Add RDEPENDS for libnss-db on glibc-utils and make Notes: For external toolchain, an extra package 'libnss-db' need to be provided If replacing glibc from core. Signed-off-by: Jackie Huang --- meta/recipes-core/glibc/glibc-package.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index df3db2cc45..1c3782dbb0 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -1,6 +1,6 @@ INHIBIT_SYSROOT_STRIP = "1" -PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" +PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" # The ld.so in this glibc supports the GNU_HASH RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)" @@ -23,6 +23,8 @@ FILES_ldd = "${bindir}/ldd" FILES_libsegfault = "${base_libdir}/libSegFault*" FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" FILES_libmemusage = "${base_libdir}/libmemusage.so" +FILES_libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile" +RDEPENDS_libnss-db = "${PN}-utils make" FILES_glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" FILES_sln = "${base_sbindir}/sln" FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" @@ -59,7 +61,6 @@ inherit libc-common multilib_header do_install_append () { rm -f ${D}${sysconfdir}/localtime - rm -rf ${D}${localstatedir} # remove empty glibc dir if [ -d ${D}${libexecdir} ]; then -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2 v2] glibc/nscd: do not cache for netgroup by default
From: Jackie Huang We don't have /etc/netgroup by default, so do not cache for netgroup by default to avoid: nscd[529]: 529 disabled inotify-based monitoring for file `/etc/netgroup': No such file or directory nscd[529]: 529 stat failed for file `/etc/netgroup'; will try again later: No such file or directory Signed-off-by: Jackie Huang --- meta/recipes-core/glibc/glibc-package.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 1c3782dbb0..c4ca94c981 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -98,6 +98,7 @@ do_install_append () { install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd install -m 0755 ${S}/nscd/nscd.conf ${D}${sysconfdir}/nscd.conf sed -i "s%daemon%start-stop-daemon --start --exec%g" ${D}${sysconfdir}/init.d/nscd + sed -i "s|\(enable-cache\t\+netgroup\t\+\)yes|\1no|" ${D}${sysconfdir}/nscd.conf install -d ${D}${systemd_unitdir}/system install -m 0644 ${S}/nscd/nscd.service ${D}${systemd_unitdir}/system/ -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] glibc/nscd: do not cache for netgroup by default
From: Jackie Huang We don't have /etc/netgroup by default, so do not cache for netgroup by default to avoid: nscd[529]: 529 disabled inotify-based monitoring for file `/etc/netgroup': No such file or directory nscd[529]: 529 stat failed for file `/etc/netgroup'; will try again later: No such file or directory Signed-off-by: Jackie Huang --- meta/recipes-core/glibc/glibc-package.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 1c3782dbb0..c4ca94c981 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -98,6 +98,7 @@ do_install_append () { install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd install -m 0755 ${S}/nscd/nscd.conf ${D}${sysconfdir}/nscd.conf sed -i "s%daemon%start-stop-daemon --start --exec%g" ${D}${sysconfdir}/init.d/nscd + sed -i "s|\(enable-cache\t\+netgroup\t\+\)yes|\1no|" ${D}${sysconfdir}/nscd.conf install -d ${D}${systemd_unitdir}/system install -m 0644 ${S}/nscd/nscd.service ${D}${systemd_unitdir}/system/ -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] glibc: fixes for nscd and libnss-db
From: Jackie Huang -- The following changes since commit 514a808f21c37b6ad704ce397bb2740ecc9a93bc: ref-manual: Updates to "Image Generation" section. (2017-10-30 15:55:08 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_nscd_171031_0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_nscd_171031_0 Jackie Huang (2): glibc: re-package for libnss-db glibc/nscd: do not cache for netgroup by default meta/recipes-core/glibc/glibc-package.inc | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] glibc: re-package for libnss-db
From: Jackie Huang On other distros like ubuntu/centos, libnss-db usually provides: - The libraries - The Makefile to create database (in /var/db for centos, /var/lib/misc/ for ubuntu) - The makedb command (it's in glibc-common for centos7) What we had is: - The libraries are in glibc-extra-nss - The Makefile is removed - The makedb command is in glibc-utils (lack of dependency) So when glibc-extra-nss is installed but glibc-utils is not, we see error like: nscd[165]: 165 checking for monitored file `/var/db/group.db': No such file or directory nscd[165]: 165 checking for monitored file `/var/db/passwd.db': No such file or directory And there is not an easy way to create these databases. To fix the issue: - Re-package the libraries into libnss-db - Don't remove the Makefile and add it in libnss-db - Add RDEPENDS for libnss-db on glibc-utils and make Signed-off-by: Jackie Huang --- meta/recipes-core/glibc/glibc-package.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index df3db2cc45..1c3782dbb0 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -1,6 +1,6 @@ INHIBIT_SYSROOT_STRIP = "1" -PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" +PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" # The ld.so in this glibc supports the GNU_HASH RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)" @@ -23,6 +23,8 @@ FILES_ldd = "${bindir}/ldd" FILES_libsegfault = "${base_libdir}/libSegFault*" FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" FILES_libmemusage = "${base_libdir}/libmemusage.so" +FILES_libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile" +RDEPENDS_libnss-db = "${PN}-utils make" FILES_glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" FILES_sln = "${base_sbindir}/sln" FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" @@ -59,7 +61,6 @@ inherit libc-common multilib_header do_install_append () { rm -f ${D}${sysconfdir}/localtime - rm -rf ${D}${localstatedir} # remove empty glibc dir if [ -d ${D}${libexecdir} ]; then -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] perl: remove the reference of DEBUG_PREFIX_MAP
From: Jackie Huang Remove all instances of -fdebug-prefix-map in ccflags* because they contain references to the build host and are not needed. Signed-off-by: Jackie Huang --- meta/recipes-devtools/perl/perl_5.24.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb b/meta/recipes-devtools/perl/perl_5.24.1.bb index 1e1d4f50fc..b55d2223e2 100644 --- a/meta/recipes-devtools/perl/perl_5.24.1.bb +++ b/meta/recipes-devtools/perl/perl_5.24.1.bb @@ -223,6 +223,7 @@ PACKAGE_PREPROCESS_FUNCS += "perl_package_preprocess" perl_package_preprocess () { # Fix up installed configuration sed -i -e "s,${D},,g" \ + -e "s,${DEBUG_PREFIX_MAP},,g" \ -e "s,--sysroot=${STAGING_DIR_HOST},,g" \ -e "s,-isystem${STAGING_INCDIR} ,,g" \ -e "s,${STAGING_LIBDIR},${libdir},g" \ -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] acpica: use update-alternatives for acpixtract
From: Jackie Huang acpixtract is both provided by acpica and pmtools, so use update-alternatives to fix conflicts: | file /usr/bin/acpixtract conflicts between attempted installs of pmtools-20130209+git0+3ebe0e54c5-r0.i586 and acpica-20170303-r0.i586 Signed-off-by: Jackie Huang --- meta/recipes-extended/acpica/acpica_20170303.bb | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-extended/acpica/acpica_20170303.bb b/meta/recipes-extended/acpica/acpica_20170303.bb index 12dfc6da3f..e712ca008d 100644 --- a/meta/recipes-extended/acpica/acpica_20170303.bb +++ b/meta/recipes-extended/acpica/acpica_20170303.bb @@ -27,6 +27,11 @@ UPSTREAM_CHECK_URI = "https://acpica.org/downloads"; S = "${WORKDIR}/acpica-unix2-${PV}" +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "acpixtract" + EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'" do_install() { -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rootfs-postcommands.bbclass: add support for /etc/ld.so.conf.d/*.conf
From: Jackie Huang There are advantages in changing the contents of ld.so.conf to "include /etc/ld.so.conf.d/*.conf" instead of directly listing directories in it, just like most distributions are doing the same. Signed-off-by: Jackie Huang --- meta/classes/rootfs-postcommands.bbclass | 13 + 1 file changed, 13 insertions(+) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index dc5a76baba..af01eb550a 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -20,6 +20,9 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only # Generates test data file with data store variables expanded in json format ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " +# Add support for /etc/ld.so.conf.d/*.conf if ldconfig is enabled +ROOTFS_POSTINSTALL_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', 'add_ld_so_conf_d ;', '', d)}" + # Write manifest IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.manifest" ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " @@ -244,6 +247,16 @@ make_zimage_symlink_relative () { fi } +# Add support for /etc/ld.so.conf.d/*.conf +add_ld_so_conf_d() { +if [ -f ${IMAGE_ROOTFS}${sysconfdir}/ld.so.conf ]; then +if ! `grep -q 'include ld.so.conf.d\/\*.conf' /etc/ld.so.conf`; then +echo 'include ld.so.conf.d/*.conf' >> ${IMAGE_ROOTFS}${sysconfdir}/ld.so.conf +fi +mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/ld.so.conf.d +fi +} + python write_image_manifest () { from oe.rootfs import image_list_installed_packages from oe.utils import format_pkg_list -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] webkitgtk: disable gobject-introspection on armv7a
From: Jackie Huang Disable gobject-introspection on armv7a and armv7ve to avoid do_compile failure: | qemu: uncaught target signal 11 (Segmentation fault) - core dumped | Segmentation fault Signed-off-by: Jackie Huang --- meta/recipes-sato/webkit/webkitgtk_2.16.6.bb | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb b/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb index df355d29ba..0f126cba81 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb @@ -112,3 +112,8 @@ ARM_INSTRUCTION_SET_armv6 = "arm" ARM_INSTRUCTION_SET_armv7a = "thumb" ARM_INSTRUCTION_SET_armv7r = "thumb" ARM_INSTRUCTION_SET_armv7ve = "thumb" + +# qemu: uncaught target signal 11 (Segmentation fault) - core dumped +# Segmentation fault +GI_DATA_ENABLED_armv7a = "False" +GI_DATA_ENABLED_armv7ve = "False" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libva-utils: add opengl to REQUIRED_DISTRO_FEATURES
From: Jackie Huang libva-utils depends on libva which requires opengl in DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-graphics/libva/libva-utils_1.8.3.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-graphics/libva/libva-utils_1.8.3.bb b/meta/recipes-graphics/libva/libva-utils_1.8.3.bb index 9c2c0d657b..c082c18b52 100644 --- a/meta/recipes-graphics/libva/libva-utils_1.8.3.bb +++ b/meta/recipes-graphics/libva/libva-utils_1.8.3.bb @@ -25,6 +25,9 @@ DEPENDS = "libva" inherit autotools pkgconfig distro_features_check +# depends on libva which requires opengl +REQUIRED_DISTRO_FEATURES = "opengl" + PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxext libxfixes" PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] boost: add python to default PACKAGECONFIG options
From: Jackie Huang We want to provide python libs by default, and some other popular Linux distributions like redhat/fedora does the same. Signed-off-by: Jackie Huang --- meta/recipes-support/boost/boost.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 4ff70e3..f4ecc10 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -38,7 +38,7 @@ BOOST_LIBS_remove_class-native = " context coroutine" BOOST_LIBS_remove_mips16e = "wave" # optional libraries -PACKAGECONFIG ??= "locale" +PACKAGECONFIG ??= "locale python" PACKAGECONFIG[locale] = ",,icu" PACKAGECONFIG[graph_parallel] = ",,,boost-mpi mpich" PACKAGECONFIG[mpi] = ",,mpich" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] webkitgtk: disable gobject-introspection on armv7a
From: Jackie Huang Disable gobject-introspection on armv7a to avoid do_compile failure: | qemu: uncaught target signal 11 (Segmentation fault) - core dumped | Segmentation fault Signed-off-by: Jackie Huang --- meta/recipes-sato/webkit/webkitgtk_2.16.6.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb b/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb index df355d2..a53c42d 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb @@ -112,3 +112,7 @@ ARM_INSTRUCTION_SET_armv6 = "arm" ARM_INSTRUCTION_SET_armv7a = "thumb" ARM_INSTRUCTION_SET_armv7r = "thumb" ARM_INSTRUCTION_SET_armv7ve = "thumb" + +# qemu: uncaught target signal 11 (Segmentation fault) - core dumped +# Segmentation fault +EXTRA_OECMAKE_append_armv7a = " -DENABLE_INTROSPECTION=OFF " -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] initscripts: split sushell into sub package
From: Jackie Huang * sushell is required by systemd service debug-shell when selinux is enabled, but it doesn't make sense to make systemd depend on initscripts, so split sushell into sub package initscripts-sushell. * The bash dependency has been removed by: ''' 4917e36a77bd6821b45db52caa43939d344d92f6 initscripts: Fix regression for requiring /bin/bash ''' so remove bash from RDEPENDS when selinux is enabled. Signed-off-by: Jackie Huang --- meta/recipes-core/initscripts/initscripts_1.0.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 7ab0d2b..d627d2e 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -46,11 +46,12 @@ inherit update-alternatives DEPENDS_append = " update-rc.d-native" PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" -PACKAGES =+ "${PN}-functions" +PACKAGES =+ "${PN}-functions ${PN}-sushell" RDEPENDS_${PN} = "${PN}-functions \ - ${@bb.utils.contains('DISTRO_FEATURES','selinux','bash','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ " FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" +FILES_${PN}-sushell = "${base_sbindir}/sushell" ALTERNATIVE_PRIORITY_${PN}-functions = "90" ALTERNATIVE_${PN}-functions = "functions" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] systemd: fixes for debug-shell service
From: Jackie Huang This fixes the following error when selinux is enabled: # systemd-analyze --man=false verify /lib/systemd/system/debug-shell.service debug-shell.service: Command /sbin/sushell is not executable: No such file or directory -- The following changes since commit 5c9ef0734d23909b5694ed43cdbb205c2ba9ca95: devtool/copy_buildsystem: adds meta-skeleton layer in the eSDK installation. (2017-08-19 22:15:25 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_debug-shell_170822_0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_debug-shell_170822_0 Jackie Huang (2): initscripts: split sushell into sub package systemd: add dependency on initscripts-sushell for selinux meta/recipes-core/initscripts/initscripts_1.0.bb | 5 +++-- meta/recipes-core/systemd/systemd_234.bb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] systemd: add dependency on initscripts-sushell for selinux
From: Jackie Huang sushell is required by systemd service debug-shell when selinux is enabled. Signed-off-by: Jackie Huang --- meta/recipes-core/systemd/systemd_234.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb index 4560cf4..2736f38 100644 --- a/meta/recipes-core/systemd/systemd_234.bb +++ b/meta/recipes-core/systemd/systemd_234.bb @@ -106,7 +106,7 @@ PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" # Update NAT firewall rules PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables" PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,," -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,initscripts-sushell" PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind" PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] valgrind: improvements for run-ptest
From: Jackie Huang * Add statistic summary for run-ptest * Ensure the script can be run anywhere Signed-off-by: Jackie Huang --- meta/recipes-devtools/valgrind/valgrind/run-ptest | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/valgrind/valgrind/run-ptest b/meta/recipes-devtools/valgrind/valgrind/run-ptest index f9a72ec4a9..447d33c8cb 100755 --- a/meta/recipes-devtools/valgrind/valgrind/run-ptest +++ b/meta/recipes-devtools/valgrind/valgrind/run-ptest @@ -2,11 +2,24 @@ # run-ptest - 'ptest' test infrastructure shell script that # wraps the valgrind regression script vg_regtest. -# Must be run in the /usr/lib/valgrind/ptest directory. # # Dave Lerner ### VALGRINDLIB=@libdir@/valgrind -tests/vg_regtest --all \ +LOG="${VALGRINDLIB}/ptest/valgrind_ptest_$(date +%Y%m%d-%H%M%S).log" + +cd ${VALGRINDLIB}/ptest && ./tests/vg_regtest --all \ --valgrind=/usr/bin/valgrind --valgrind-lib=$VALGRINDLIB \ - --yocto-ptest +--yocto-ptest 2>&1|tee ${LOG} + +passed=`grep PASS: ${LOG}|wc -l` +failed=`grep FAIL: ${LOG}|wc -l` +skipped=`grep SKIP: ${LOG}|wc -l` +all=$((passed + failed + skipped)) + +( echo "=== Test Summary ===" + echo "TOTAL: ${all}" + echo "PASSED: ${passed}" + echo "FAILED: ${failed}" + echo "SKIPPED: ${skipped}" +) | tee -a /${LOG} -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xserver-xorg: Fix CVE-2017-10971
From: Jackie Huang Backport 3 patches to fix CVE-2017-10971: In the X.Org X server before 2017-06-19, a user authenticated to an X Session could crash or execute code in the context of the X Server by exploiting a stack overflow in the endianness conversion of X Events. Reference: https://nvd.nist.gov/vuln/detail/CVE-2017-10971 Signed-off-by: Jackie Huang --- .../xserver-xorg/CVE-2017-10971-1.patch| 76 ++ .../xserver-xorg/CVE-2017-10971-2.patch| 55 .../xserver-xorg/CVE-2017-10971-3.patch| 50 ++ .../xorg-xserver/xserver-xorg_1.19.3.bb| 3 + 4 files changed, 184 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-1.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-2.patch create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-3.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-1.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-1.patch new file mode 100644 index 00..23c8049896 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-1.patch @@ -0,0 +1,76 @@ +From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:40 +0300 +Subject: [PATCH] dix: Disallow GenericEvent in SendEvent request. + +The SendEvent request holds xEvent which is exactly 32 bytes long, no more, +no less. Both ProcSendEvent and SProcSendEvent verify that the received data +exactly match the request size. However nothing stops the client from passing +in event with xEvent::type = GenericEvent and any value of +xGenericEvent::length. + +In the case of ProcSendEvent, the event will be eventually passed to +WriteEventsToClient which will see that it is Generic event and copy the +arbitrary length from the receive buffer (and possibly past it) and send it to +the other client. This allows clients to copy unitialized heap memory out of X +server or to crash it. + +In case of SProcSendEvent, it will attempt to swap the incoming event by +calling a swapping function from the EventSwapVector array. The swapped event +is written to target buffer, which in this case is local xEvent variable. The +xEvent variable is 32 bytes long, but the swapping functions for GenericEvents +expect that the target buffer has size matching the size of the source +GenericEvent. This allows clients to cause stack buffer overflows. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer + +CVE: CVE-2017-10971 + +Upstream-Status: Backport [https://cgit.freedesktop.org/xorg/xserver/commit/?id=215f894965df5fb0bb45b107d84524e700d2073c] + +Signed-off-by: Jackie Huang +--- + dix/events.c |6 ++ + dix/swapreq.c |7 +++ + 2 files changed, 13 insertions(+) + +diff --git a/dix/events.c b/dix/events.c +index 3e3a01e..d3a33ea 100644 +--- a/dix/events.c b/dix/events.c +@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client) + client->errorValue = stuff->event.u.u.type; + return BadValue; + } ++/* Generic events can have variable size, but SendEvent request holds ++ exactly 32B of event data. */ ++if (stuff->event.u.u.type == GenericEvent) { ++client->errorValue = stuff->event.u.u.type; ++return BadValue; ++} + if (stuff->event.u.u.type == ClientMessage && + stuff->event.u.u.detail != 8 && + stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) { +diff --git a/dix/swapreq.c b/dix/swapreq.c +index 719e9b8..6785059 100644 +--- a/dix/swapreq.c b/dix/swapreq.c +@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client) + swapl(&stuff->destination); + swapl(&stuff->eventMask); + ++/* Generic events can have variable size, but SendEvent request holds ++ exactly 32B of event data. */ ++if (stuff->event.u.u.type == GenericEvent) { ++client->errorValue = stuff->event.u.u.type; ++return BadValue; ++} ++ + /* Swap event */ + proc = EventSwapVector[stuff->event.u.u.type & 0177]; + if (!proc || proc == NotImplemented)/* no swapping proc; invalid event type? */ +-- +1.7.9.5 + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-2.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-2.patch new file mode 100644 index 00..5c9887afa1 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-2.patch @@ -0,0 +1,55 @@ +From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:41 +0300 +Subject: [PATCH] Xi: Verify all events in ProcXSendExtensionEvent. + +The requirement is that events have type in range +EXTENSION_EVENT_BASE..lastEvent, but it was tested +only for first event of all. + +Signed-of
[OE-core] [PATCH 2/3] libsndfile1: Fix CVE-2017-8362
From: Jackie Huang Backport the patch to fix CVE-2017-8362: The flac_buffer_copy function in flac.c in libsndfile 1.0.28 allows remote attackers to cause a denial of service (invalid read and application crash) via a crafted audio file. Reference: https://nvd.nist.gov/vuln/detail/CVE-2017-8362 Signed-off-by: Jackie Huang --- .../libsndfile/libsndfile1/CVE-2017-8362.patch | 59 ++ .../libsndfile/libsndfile1_1.0.28.bb | 1 + 2 files changed, 60 insertions(+) create mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch new file mode 100644 index 00..9ee7e46a6d --- /dev/null +++ b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch @@ -0,0 +1,59 @@ +From ef1dbb2df1c0e741486646de40bd638a9c4cd808 Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo +Date: Fri, 14 Apr 2017 15:19:16 +1000 +Subject: [PATCH] src/flac.c: Fix a buffer read overflow + +A file (generated by a fuzzer) which increased the number of channels +from one frame to the next could cause a read beyond the end of the +buffer provided by libFLAC. Only option is to abort the read. + +Closes: https://github.com/erikd/libsndfile/issues/231 + +CVE: CVE-2017-8362 + +Upstream-Status: Backport [https://github.com/erikd/libsndfile/commit/ef1dbb2df1c0e741486646de40bd638a9c4cd808] + +Signed-off-by: Jackie Huang +--- + src/flac.c | 11 +-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/flac.c b/src/flac.c +index 5a4f8c2..e4f9aaa 100644 +--- a/src/flac.c b/src/flac.c +@@ -169,6 +169,14 @@ flac_buffer_copy (SF_PRIVATE *psf) + const int32_t* const *buffer = pflac->wbuffer ; + unsigned i = 0, j, offset, channels, len ; + ++ if (psf->sf.channels != (int) frame->header.channels) ++ { psf_log_printf (psf, "Error: FLAC frame changed from %d to %d channels\n" ++ "Nothing to do but to error out.\n" , ++ psf->sf.channels, frame->header.channels) ; ++ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; ++ return 0 ; ++ } ; ++ + /* + ** frame->header.blocksize is variable and we're using a constant blocksize + ** of FLAC__MAX_BLOCK_SIZE. +@@ -202,7 +210,6 @@ flac_buffer_copy (SF_PRIVATE *psf) + return 0 ; + } ; + +- + len = SF_MIN (pflac->len, frame->header.blocksize) ; + + if (pflac->remain % channels != 0) +@@ -436,7 +443,7 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_ + { case FLAC__METADATA_TYPE_STREAMINFO : + if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels) + { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n" +- "Nothing to be but to error out.\n" , ++ "Nothing to do but to error out.\n" , + psf->sf.channels, metadata->data.stream_info.channels) ; + psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; + return ; +-- +2.7.4 + diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb index f80ce2fc99..2bd51b1cd9 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb @@ -8,6 +8,7 @@ LICENSE = "LGPLv2.1" SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz \ file://CVE-2017-6892.patch \ file://CVE-2017-8361-8365.patch \ + file://CVE-2017-8362.patch \ " SRC_URI[md5sum] = "646b5f98ce89ac60cdb060fcd398247c" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] libsndfile1: Fix CVE-2017-8363
From: Jackie Huang Backport the patch to fix CVE-2017-8363: The flac_buffer_copy function in flac.c in libsndfile 1.0.28 allows remote attackers to cause a denial of service (heap-based buffer over-read and application crash) via a crafted audio file. Reference: https://nvd.nist.gov/vuln/detail/CVE-2017-8363 Signed-off-by: Jackie Huang --- .../libsndfile/libsndfile1/CVE-2017-8363.patch | 37 ++ .../libsndfile/libsndfile1_1.0.28.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8363.patch diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8363.patch b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8363.patch new file mode 100644 index 00..e526e5a346 --- /dev/null +++ b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8363.patch @@ -0,0 +1,37 @@ +From cd7da8dbf6ee4310d21d9e44b385d6797160d9e8 Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo +Date: Wed, 12 Apr 2017 20:19:34 +1000 +Subject: [PATCH] src/flac.c: Fix another memory leak + +When the FLAC decoder was passed a malformed file, the associated +`FLAC__StreamDecoder` object was not getting released. + +Closes: https://github.com/erikd/libsndfile/issues/233 + +CVE: CVE-2017-8363 + +Upstream-Status: Backport [https://github.com/erikd/libsndfile/commit/cd7da8dbf6ee4310d21d9e44b385d6797160d9e8] + +Signed-off-by: Jackie Huang +--- + src/flac.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/flac.c b/src/flac.c +index 986a7b8..5a4f8c2 100644 +--- a/src/flac.c b/src/flac.c +@@ -841,7 +841,9 @@ flac_read_header (SF_PRIVATE *psf) + + psf_log_printf (psf, "End\n") ; + +- if (psf->error == 0) ++ if (psf->error != 0) ++ FLAC__stream_decoder_delete (pflac->fsd) ; ++ else + { FLAC__uint64 position ; + + FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ; +-- +2.7.4 + diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb index 2bd51b1cd9..281ac82e39 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb @@ -9,6 +9,7 @@ SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz \ file://CVE-2017-6892.patch \ file://CVE-2017-8361-8365.patch \ file://CVE-2017-8362.patch \ + file://CVE-2017-8363.patch \ " SRC_URI[md5sum] = "646b5f98ce89ac60cdb060fcd398247c" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] libsndfile1: Fix CVE-2017-8361 and CVE-2017-8365
From: Jackie Huang Backport the patch to fix two CVEs: CVE-2017-8361: The flac_buffer_copy function in flac.c in libsndfile 1.0.28 allows remote attackers to cause a denial of service (buffer overflow and application crash) or possibly have unspecified other impact via a crafted audio file. CVE-2017-8365: The i2les_array function in pcm.c in libsndfile 1.0.28 allows remote attackers to cause a denial of service (buffer over-read and application crash) via a crafted audio file. Reference: https://nvd.nist.gov/vuln/detail/CVE-2017-8361 https://nvd.nist.gov/vuln/detail/CVE-2017-8365 Signed-off-by: Jackie Huang --- .../libsndfile1/CVE-2017-8361-8365.patch | 73 ++ .../libsndfile/libsndfile1_1.0.28.bb | 1 + 2 files changed, 74 insertions(+) create mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8361-8365.patch diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8361-8365.patch b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8361-8365.patch new file mode 100644 index 00..ac99516bb3 --- /dev/null +++ b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8361-8365.patch @@ -0,0 +1,73 @@ +From fd0484aba8e51d16af1e3a880f9b8b857b385eb3 Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo +Date: Wed, 12 Apr 2017 19:45:30 +1000 +Subject: [PATCH] FLAC: Fix a buffer read overrun + +Buffer read overrun occurs when reading a FLAC file that switches +from 2 channels to one channel mid-stream. Only option is to +abort the read. + +Closes: https://github.com/erikd/libsndfile/issues/230 + +CVE: CVE-2017-8361 CVE-2017-8365 + +Upstream-Status: Backport [https://github.com/erikd/libsndfile/commit/fd0484aba8e51d16af1e3a880f9b8b857b385eb3] + +Signed-off-by: Jackie Huang +--- + src/common.h | 1 + + src/flac.c| 13 + + src/sndfile.c | 1 + + 3 files changed, 15 insertions(+) + +diff --git a/src/common.h b/src/common.h +index 0bd810c..e2669b6 100644 +--- a/src/common.h b/src/common.h +@@ -725,6 +725,7 @@ enum + SFE_FLAC_INIT_DECODER, + SFE_FLAC_LOST_SYNC, + SFE_FLAC_BAD_SAMPLE_RATE, ++ SFE_FLAC_CHANNEL_COUNT_CHANGED, + SFE_FLAC_UNKOWN_ERROR, + + SFE_WVE_NOT_WVE, +diff --git a/src/flac.c b/src/flac.c +index 84de0e2..986a7b8 100644 +--- a/src/flac.c b/src/flac.c +@@ -434,6 +434,19 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_ + + switch (metadata->type) + { case FLAC__METADATA_TYPE_STREAMINFO : ++ if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels) ++ { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n" ++ "Nothing to be but to error out.\n" , ++ psf->sf.channels, metadata->data.stream_info.channels) ; ++ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ; ++ return ; ++ } ; ++ ++ if (psf->sf.channels > 0 && psf->sf.samplerate != (int) metadata->data.stream_info.sample_rate) ++ { psf_log_printf (psf, "Warning: FLAC stream changed sample rates from %d to %d.\n" ++ "Carrying on as if nothing happened.", ++ psf->sf.samplerate, metadata->data.stream_info.sample_rate) ; ++ } ; + psf->sf.channels = metadata->data.stream_info.channels ; + psf->sf.samplerate = metadata->data.stream_info.sample_rate ; + psf->sf.frames = metadata->data.stream_info.total_samples ; +diff --git a/src/sndfile.c b/src/sndfile.c +index 4187561..e2a87be 100644 +--- a/src/sndfile.c b/src/sndfile.c +@@ -245,6 +245,7 @@ ErrorStruct SndfileErrors [] = + { SFE_FLAC_INIT_DECODER , "Error : problem with initialization of the flac decoder." }, + { SFE_FLAC_LOST_SYNC , "Error : flac decoder lost sync." }, + { SFE_FLAC_BAD_SAMPLE_RATE, "Error : flac does not support this sample rate." }, ++ { SFE_FLAC_CHANNEL_COUNT_CHANGED, "Error : flac channel changed mid stream." }, + { SFE_FLAC_UNKOWN_ERROR , "Error : unknown error in flac decoder." }, + + { SFE_WVE_NOT_WVE , "Error : not a WVE file." }, +-- +2.7.4 + diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb index e6a92a2a41..f80ce2fc99 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb @@ -7,6 +7,7 @@ LICENSE = "LGP
[OE-core] [PATCH 0/3] libsndfile1: Fix several CVE issues
From: Jackie Huang -- The following changes since commit 55bf88603927469de9aa9f6fd4d449230d2e61e3: poky: Add nios2 to list of qemu targets (2017-08-17 00:21:35 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_libsndfile1_CVE_170817_1 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_libsndfile1_CVE_170817_1 Jackie Huang (3): libsndfile1: Fix CVE-2017-8361 and CVE-2017-8365 libsndfile1: Fix CVE-2017-8362 libsndfile1: Fix CVE-2017-8363 .../libsndfile1/CVE-2017-8361-8365.patch | 73 ++ .../libsndfile/libsndfile1/CVE-2017-8362.patch | 59 + .../libsndfile/libsndfile1/CVE-2017-8363.patch | 37 +++ .../libsndfile/libsndfile1_1.0.28.bb | 3 + 4 files changed, 172 insertions(+) create mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8361-8365.patch create mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch create mode 100644 meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8363.patch -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] debianutils: set higher priority than busybox for run-parts
From: Jackie Huang debianutils-run-parts should have higher priority than busybox (which is 50), so set the priority to 60 for debianutils-run-parts. Signed-off-by: Jackie Huang --- meta/recipes-support/debianutils/debianutils_4.8.1.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb b/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb index 23f842102b5..d41bf98f895 100644 --- a/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb +++ b/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb @@ -37,6 +37,8 @@ RDEPENDS_${PN} += "${PN}-run-parts" ALTERNATIVE_PRIORITY="30" ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which" + +ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" ALTERNATIVE_${PN}-run-parts = "run-parts" ALTERNATIVE_${PN}-doc = "which.1" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] debianutils: set higher priority than busybox for run-parts
From: Jackie Huang debianutils-run-parts should have higher priority than busybox (which is 50), so set the priority to 60 for debianutils-run-parts. Signed-off-by: Jackie Huang --- meta/recipes-support/debianutils/debianutils_4.8.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/debianutils/debianutils_4.8.1.bb b/meta/recipes-support/debianutils/debianutils_4.8.1.bb index 54c345ea25..0529a50983 100644 --- a/meta/recipes-support/debianutils/debianutils_4.8.1.bb +++ b/meta/recipes-support/debianutils/debianutils_4.8.1.bb @@ -38,6 +38,8 @@ RDEPENDS_${PN} += "${PN}-run-parts" ALTERNATIVE_PRIORITY="30" ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which" + +ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" ALTERNATIVE_${PN}-run-parts = "run-parts" ALTERNATIVE_${PN}-doc = "which.1" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] dropbear: add default config file to disable root login
From: Jackie Huang root login is disabled by default for openssh and we can enable it through IMAGE_FEATURES 'debug-tweaks' or 'allow-empty-password', so change to the same default behavior for dropbear. Signed-off-by: Jackie Huang --- meta/recipes-core/dropbear/dropbear.inc | 3 +++ meta/recipes-core/dropbear/dropbear/dropbear.default | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear.default diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index b6b436c584..359a898116 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc @@ -22,6 +22,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ file://dropbearkey.service \ file://dropbear@.service \ file://dropbear.socket \ + file://dropbear.default \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ @@ -61,6 +62,8 @@ do_install() { ${D}${sbindir} \ ${D}${localstatedir} + install -m 0755 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear + install -m 0755 dropbearmulti ${D}${sbindir}/ ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient diff --git a/meta/recipes-core/dropbear/dropbear/dropbear.default b/meta/recipes-core/dropbear/dropbear/dropbear.default new file mode 100644 index 00..522453a86c --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear/dropbear.default @@ -0,0 +1,2 @@ +# Disallow root logins by default +DROPBEAR_EXTRA_ARGS="-w" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] rootfs-postcommands: split ssh_allow_empty_password
From: Jackie Huang "allow root login" should not be bundled in ssh_allow_empty_password, because some distro may want only one of "allow root login" and "allow empty password", so split it out into ssh_allow_root_login and add new imagefeature allow-root-login so they can be controlled separately, debug-tweaks will still include both of them. Signed-off-by: Jackie Huang --- meta/classes/image.bbclass | 2 +- meta/classes/rootfs-postcommands.bbclass | 25 ++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6e30b96745..180c19c10b 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -23,7 +23,7 @@ inherit ${TESTIMAGECLASS} # IMAGE_FEATURES may contain any available package group IMAGE_FEATURES ?= "" IMAGE_FEATURES[type] = "list" -IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs empty-root-password allow-empty-password post-install-logging" +IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs empty-root-password allow-empty-password allow-root-login post-install-logging" # Generate companion debugfs? IMAGE_GEN_DEBUGFS ?= "0" diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 78f7c55933..81af4e8519 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -2,9 +2,12 @@ # Zap the root password if debug-tweaks feature is not enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'empty-root-password' ], "", "zap_empty_root_password ; ",d)}' -# Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks is enabled +# Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks or allow-empty-password is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-empty-password' ], "ssh_allow_empty_password; ", "",d)}' +# Allow dropbear/openssh to accept root logins if debug-tweaks or allow-root-login is enabled +ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-root-login' ], "ssh_allow_root_login; ", "",d)}' + # Enable postinst logging if debug-tweaks is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' @@ -137,12 +140,11 @@ zap_empty_root_password () { } # -# allow dropbear/openssh to accept root logins and logins from accounts with an empty password string +# allow dropbear/openssh to accept logins from accounts with an empty password string # ssh_allow_empty_password () { for config in sshd_config sshd_config_readonly; do if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config ]; then - sed -i 's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config sed -i 's/^[#[:space:]]*PermitEmptyPasswords.*/PermitEmptyPasswords yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config fi done @@ -162,6 +164,23 @@ ssh_allow_empty_password () { fi } +# +# allow dropbear/openssh to accept root logins +# +ssh_allow_root_login () { + for config in sshd_config sshd_config_readonly; do + if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config ]; then + sed -i 's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config + fi + done + + if [ -e ${IMAGE_ROOTFS}${sbindir}/dropbear ] ; then + if grep -q DROPBEAR_EXTRA_ARGS ${IMAGE_ROOTFS}${sysconfdir}/default/dropbear 2>/dev/null ; then + sed -i '/^DROPBEAR_EXTRA_ARGS=/ s/-w//' ${IMAGE_ROOTFS}${sysconfdir}/default/dropbear + fi + fi +} + ssh_disable_dns_lookup () { if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then sed -i -e 's:#UseDNS yes:UseDNS no:' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] rootfs-postcommands: split ssh_allow_empty_password
From: Jackie Huang -- The following changes since commit de7914954571ea8e717f56b6d6df13157b0973bc: scripts/contrib/patchreview: add new script (2017-06-29 13:01:32 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_ssh-allow-empty_170630_0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_ssh-allow-empty_170630_0 Jackie Huang (2): dropbear: add default config file to disable root login rootfs-postcommands: split ssh_allow_empty_password meta/classes/image.bbclass | 2 +- meta/classes/rootfs-postcommands.bbclass | 25 +++--- meta/recipes-core/dropbear/dropbear.inc| 3 +++ .../dropbear/dropbear/dropbear.default | 2 ++ 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear.default -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] kmscube: add opengl to REQUIRED_DISTRO_FEATURES
From: Jackie Huang kmscube depends on virtual/libgles2, virtual/egl and gstreamer1.0 which require opengl in DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-graphics/kmscube/kmscube_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb index 0ec5b2a7fa..9050671ab1 100644 --- a/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb @@ -11,4 +11,6 @@ SRC_URI = "git://anongit.freedesktop.org/mesa/kmscube;branch=master;protocol=git S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURES = "opengl" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kmscube: add opengl to REQUIRED_DISTRO_FEATURES
From: Jackie Huang kmscube depends on virtual/libgles2, virtual/egl (provided by mesa) and gstreamer1.0 which require opengl in DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-graphics/kmscube/kmscube_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb b/meta/recipes-graphics/kmscube/kmscube_git.bb index 0ec5b2a7fa..9050671ab1 100644 --- a/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/meta/recipes-graphics/kmscube/kmscube_git.bb @@ -11,4 +11,6 @@ SRC_URI = "git://anongit.freedesktop.org/mesa/kmscube;branch=master;protocol=git S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURES = "opengl" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] siteinfo: fix siteinfo_get_files to work with RSS
From: Jackie Huang The siteconfig cache files in ACLOCALDIR setup by autotools.bbclass has been dropped after switching to RSS, so change the siteconfig search path back to SITECONFIG_SYSROOTCACHE and the parameter name changed from aclocalcache to sysrootcache. Signed-off-by: Jackie Huang --- meta/classes/autotools.bbclass | 2 +- meta/classes/siteinfo.bbclass | 15 --- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index ac04a07cb5..efa4098d63 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -141,7 +141,7 @@ ACLOCALEXTRAPATH_class-nativesdk = " -I ${STAGING_DATADIR_NATIVE}/aclocal/" python autotools_aclocals () { # Refresh variable with cache files -d.setVar("CONFIG_SITE", siteinfo_get_files(d, aclocalcache=True)) +d.setVar("CONFIG_SITE", siteinfo_get_files(d, sysrootcache=True)) } CONFIGURE_FILES = "${S}/configure.in ${S}/configure.ac ${S}/config.h.in ${S}/acinclude.m4 Makefile.am" diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index 2c33732be3..e8e2644684 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -159,7 +159,7 @@ python () { bb.fatal("Please add your architecture to siteinfo.bbclass") } -def siteinfo_get_files(d, aclocalcache = False): +def siteinfo_get_files(d, sysrootcache = False): sitedata = siteinfo_data(d) sitefiles = "" for path in d.getVar("BBPATH").split(":"): @@ -168,18 +168,11 @@ def siteinfo_get_files(d, aclocalcache = False): if os.path.exists(filename): sitefiles += filename + " " -if not aclocalcache: +if not sysrootcache: return sitefiles -# Now check for siteconfig cache files in the directory setup by autotools.bbclass to -# avoid races. -# -# ACLOCALDIR may or may not exist so cache should only be set to True from autotools.bbclass -# after files have been copied into this location. To do otherwise risks parsing/signature -# issues and the directory being created/removed whilst this code executes. This can happen -# when a multilib recipe is parsed along with its base variant which may be running at the time -# causing rare but nasty failures -path_siteconfig = d.getVar('ACLOCALDIR') +# Now check for siteconfig cache files in sysroots +path_siteconfig = d.getVar('SITECONFIG_SYSROOTCACHE') if path_siteconfig and os.path.isdir(path_siteconfig): for i in os.listdir(path_siteconfig): if not i.endswith("_config"): -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] ncurses: add SYSROOT_DESTDIR for siteconfig_gencache
From: Jackie Huang After switching to Recipe Specific Sysroots, ncurses will not be populated in its own sysroots, then siteconfig_gencache fails to find some headers, so add ${SYSROOT_DESTDIR}/${includedir} into the search list to fix the issue. Signed-off-by: Jackie Huang --- meta/recipes-core/ncurses/ncurses.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 8990b0f5ef..1f21cd413d 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -18,6 +18,8 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/ncurses.git" EXTRA_AUTORECONF = "-I m4" CONFIG_SITE =+ "${WORKDIR}/config.cache" +EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'" + # Whether to enable separate widec libraries; must be 'true' or 'false' # # TODO: remove this variable when widec is supported in every setup? -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] siteinfo: fix siteinfo_get_files to work with RSS
From: Jackie Huang -- The following changes since commit 4aa6cdfe9f069ecd976c1257702fe8ff28c57f07: tune-mips32*.inc: use consistent comments across all three .inc files (2017-05-30 10:14:33 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_siteinfo_170531_0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_siteinfo_170531_0 Jackie Huang (2): ncurses: add SYSROOT_DESTDIR for siteconfig_gencache siteinfo: fix siteinfo_get_files to work with RSS meta/classes/autotools.bbclass| 2 +- meta/classes/siteinfo.bbclass | 15 --- meta/recipes-core/ncurses/ncurses.inc | 2 ++ 3 files changed, 7 insertions(+), 12 deletions(-) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] icu: Use LARGE_BUFFER_MAX_SIZE for cmd
From: Jackie Huang The previous patch used LARGE_BUFFER_MAX_SIZE instead of SMALL_BUFFER_MAX_SIZE for cmd in function pkg_installLibrary, which only fixed some of the cases when the command line is too long, some other cases indicate that the LARGE_BUFFER_MAX_SIZE is also needed in pkg_installCommonMode and pkg_installFileMode to avoid overflow: | *** buffer overflow detected ***: ../bin/pkgdata terminated Signed-off-by: Jackie Huang --- .../icu/icu/icu-pkgdata-large-cmd.patch| 28 ++ 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch b/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch index 6e40659227f..e758a623ef4 100644 --- a/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch +++ b/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch @@ -8,14 +8,16 @@ LARGE_BUFFER_MAX_SIZE. Upstream-Status: Pending Signed-off-by: Robert Yang +Signed-off-by: Jackie Huang --- - tools/pkgdata/pkgdata.cpp |2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + tools/pkgdata/pkgdata.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp +index 60167dd..506dd32 100644 --- a/tools/pkgdata/pkgdata.cpp +++ b/tools/pkgdata/pkgdata.cpp -@@ -1019,7 +1019,7 @@ normal_symlink_mode: +@@ -1084,7 +1084,7 @@ normal_symlink_mode: static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, UBool noVersion) { int32_t result = 0; @@ -24,6 +26,24 @@ diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp sprintf(cmd, "cd %s && %s %s %s%s%s", targetDir, +@@ -1152,7 +1152,7 @@ static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, + + static int32_t pkg_installCommonMode(const char *installDir, const char *fileName) { + int32_t result = 0; +-char cmd[SMALL_BUFFER_MAX_SIZE] = ""; ++char cmd[LARGE_BUFFER_MAX_SIZE] = ""; + + if (!T_FileStream_file_exists(installDir)) { + UErrorCode status = U_ZERO_ERROR; +@@ -1184,7 +1184,7 @@ static int32_t pkg_installCommonMode(const char *installDir, const char *fileNam + #endif + static int32_t pkg_installFileMode(const char *installDir, const char *srcDir, const char *fileListName) { + int32_t result = 0; +-char cmd[SMALL_BUFFER_MAX_SIZE] = ""; ++char cmd[LARGE_BUFFER_MAX_SIZE] = ""; + + if (!T_FileStream_file_exists(installDir)) { + UErrorCode status = U_ZERO_ERROR; -- -1.7.10.4 +1.9.1 -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ptest.bbclass: use BPN in PTEST_PATH for multilib
From: Jackie Huang Use BPN instead of PN in PTEST_PATH for multilib builds, or we get two directories for a package in libdir which doesn't make sense, e.g. $ ls /usr/lib/*coreutils /usr/lib/coreutils: libstdbuf.so /usr/lib/lib32-coreutils: ptest Signed-off-by: Jackie Huang --- meta/classes/ptest.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass index 798d802..c19f65b 100644 --- a/meta/classes/ptest.bbclass +++ b/meta/classes/ptest.bbclass @@ -2,7 +2,7 @@ SUMMARY_${PN}-ptest ?= "${SUMMARY} - Package test files" DESCRIPTION_${PN}-ptest ?= "${DESCRIPTION} \ This package contains a test directory ${PTEST_PATH} for package test purposes." -PTEST_PATH ?= "${libdir}/${PN}/ptest" +PTEST_PATH ?= "${libdir}/${BPN}/ptest" FILES_${PN}-ptest = "${PTEST_PATH}" SECTION_${PN}-ptest = "devel" ALLOW_EMPTY_${PN}-ptest = "1" -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] systemd: add dependency on initscripts-sushell for selinux
From: Jackie Huang sushell is required by systemd service debug-shell when selinux is enabled. Signed-off-by: Jackie Huang --- meta/recipes-core/systemd/systemd_232.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb index cc8781e..d38be14 100644 --- a/meta/recipes-core/systemd/systemd_232.bb +++ b/meta/recipes-core/systemd/systemd_232.bb @@ -113,7 +113,7 @@ PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" # Update NAT firewall rules PACKAGECONFIG[iptc] = "--enable-libiptc,--disable-libiptc,iptables" PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,," -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,initscripts-sushell" PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind" PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] systemd: fixes for debug-shell service
From: Jackie Huang -- The following changes since commit e436a6398684d2872cb541f1cfb0f67b3618d15a: layer.conf: bump version for change in eSDK selftest behaviour (2017-02-19 09:39:03 -0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_debug-shell_170222_1 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_debug-shell_170222_1 Jackie Huang (2): initscripts: split sushell into sub package systemd: add dependency on initscripts-sushell for selinux meta/recipes-core/initscripts/initscripts_1.0.bb | 5 +++-- meta/recipes-core/systemd/systemd_232.bb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] initscripts: split sushell into sub package
From: Jackie Huang * sushell is required by systemd service debug-shell when selinux is enabled, but it doesn't make sense to make systemd depend on initscripts, so split sushell into sub package initscripts-sushell. * The bash dependency has been removed by: ''' 4917e36a77bd6821b45db52caa43939d344d92f6 initscripts: Fix regression for requiring /bin/bash ''' so remove bash from RDEPENDS when selinux is enabled. Signed-off-by: Jackie Huang --- meta/recipes-core/initscripts/initscripts_1.0.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 2e4f7e4..7e01572 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -46,11 +46,12 @@ inherit update-alternatives DEPENDS_append = " update-rc.d-native" PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" -PACKAGES =+ "${PN}-functions" +PACKAGES =+ "${PN}-functions ${PN}-sushell" RDEPENDS_${PN} = "${PN}-functions \ - ${@bb.utils.contains('DISTRO_FEATURES','selinux','bash','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ " FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" +FILES_${PN}-sushell = "${base_sbindir}/sushell" ALTERNATIVE_PRIORITY_${PN}-functions = "90" ALTERNATIVE_${PN}-functions = "functions" -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [v2][PATCH] valgrind: make ld-XXX.so strlen intercept optional
From: Jackie Huang Hack: Depending on how glibc was compiled (e.g. optimised for size or built with _FORTIFY_SOURCE enabled) the strlen symbol might not be found in ld-XXX.so. Therefore although we should still try to intercept it, don't make it mandatory to do so. Signed-off-by: Jackie Huang --- ...-make-ld-XXX.so-strlen-intercept-optional.patch | 45 ++ meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch diff --git a/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch b/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch new file mode 100644 index 000..d04297d --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch @@ -0,0 +1,45 @@ +From 005bd11809a1ce65e9f2c28e884354a4741650b9 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Tue, 13 Dec 2016 11:29:55 +0800 +Subject: [PATCH] make ld-XXX.so strlen intercept optional + +Hack: Depending on how glibc was compiled (e.g. optimised for size or +built with _FORTIFY_SOURCE enabled) the strlen symbol might not be +found in ld-XXX.so. Therefore although we should still try to +intercept it, don't make it mandatory to do so. + +Upstream-Status: Inappropriate + +Signed-off-by: Andre McCurdy +Signed-off-by: Jackie Huang +--- + coregrind/m_redir.c | 13 - + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c +index ff35009..d7d6816 100644 +--- a/coregrind/m_redir.c b/coregrind/m_redir.c +@@ -1275,7 +1275,18 @@ static void add_hardwired_spec (const HChar* sopatt, const HChar* fnpatt, +spec->to_addr = to_addr; +spec->isWrap = False; +spec->isGlobal= False; +- spec->mandatory = mandatory; ++ ++ /* Hack: Depending on how glibc was compiled (e.g. optimised for size or ++ built with _FORTIFY_SOURCE enabled) the strlen symbol might not be found. ++ Therefore although we should still try to intercept it, don't make it ++ mandatory to do so. We over-ride "mandatory" here to avoid the need to ++ patch the many different architecture specific callers to ++ add_hardwired_spec(). */ ++ if (0==VG_(strcmp)("strlen", fnpatt)) ++ spec->mandatory = NULL; ++ else ++ spec->mandatory = mandatory; ++ +/* VARIABLE PARTS */ +spec->mark= False; /* not significant */ +spec->done= False; /* not significant */ +-- +1.9.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb index 233ff47..5c3002f 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb @@ -22,6 +22,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch \ file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \ file://avoid-neon-for-targets-which-don-t-support-it.patch \ + file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \ " SRC_URI_append_libc-musl = "\ file://0001-fix-build-for-musl-targets.patch \ -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] extrausers.bbclass: Use PACKAGE_INSTALL instead of IMAGE_INSTALL
From: Jackie Huang The initramfs image recipes changed to use PACKAGE_INSTALL so they will not be affected by IMAGE_INSTALL, and will cause error when inherit extrausers: | ERROR: core-image-minimal-initramfs-1.0-r0 do_rootfs: core-image-minimal-initramfs: usermod command did not succeed. So use PACKAGE_INSTALL as well in extrausers.bbclass to fix it. Signed-off-by: Jackie Huang --- meta/classes/extrausers.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/extrausers.bbclass b/meta/classes/extrausers.bbclass index 43900f3..852810e 100644 --- a/meta/classes/extrausers.bbclass +++ b/meta/classes/extrausers.bbclass @@ -15,7 +15,7 @@ inherit useradd_base -IMAGE_INSTALL_append = " ${@['', 'base-passwd shadow'][bool(d.getVar('EXTRA_USERS_PARAMS', True))]}" +PACKAGE_INSTALL_append = " ${@['', 'base-passwd shadow'][bool(d.getVar('EXTRA_USERS_PARAMS', True))]}" # Image level user / group settings ROOTFS_POSTPROCESS_COMMAND_append = " set_user_group;" -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] ltp: avoid segmentation fault in netns tests
From: Jackie Huang * backport a patch to avoid segmentation fault in netns tests. * rename previous patch to have ordered prefix number. Signed-off-by: Jackie Huang --- ...twork-nfsv4-acl-acl1.c-Security-fix-on-s.patch} | 0 ...rs-netns_netlink-Avoid-segmentation-fault.patch | 50 ++ meta/recipes-extended/ltp/ltp_20160126.bb | 3 +- 3 files changed, 52 insertions(+), 1 deletion(-) rename meta/recipes-extended/ltp/ltp/{0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch => 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch} (100%) create mode 100644 meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch similarity index 100% rename from meta/recipes-extended/ltp/ltp/0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch rename to meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch diff --git a/meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch b/meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch new file mode 100644 index 000..18d1f72 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch @@ -0,0 +1,50 @@ +From 193ce739b2a5174269a958b00c3a5590de944e0d Mon Sep 17 00:00:00 2001 +From: Huacai Chen +Date: Thu, 27 Oct 2016 14:45:52 +0800 +Subject: [PATCH] containers/netns_netlink: Avoid segmentation fault + +In order to avoid segmentation fault (use NULL as a function pointer), +this patch modify check_netns() by passing a dummy function pointer to +do_clone_unshare_test(). + +Signed-off-by: Huacai Chen +Signed-off-by: Cyril Hrubis + +Upstream-Status: Backport + +Signed-off-by: Jackie Huang +--- + testcases/kernel/containers/netns/netns_helper.h | 10 -- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/testcases/kernel/containers/netns/netns_helper.h b/testcases/kernel/containers/netns/netns_helper.h +index 2a331ae..7df6dcb 100644 +--- a/testcases/kernel/containers/netns/netns_helper.h b/testcases/kernel/containers/netns/netns_helper.h +@@ -56,6 +56,12 @@ static void check_iproute(unsigned int spe_ipver) + pclose(ipf); + } + ++static int dummy(void *arg) ++{ ++ (void) arg; ++ return 0; ++} ++ + static void check_netns(void) + { + int pid, status; +@@ -64,8 +70,8 @@ static void check_netns(void) + tst_brkm(TCONF | TERRNO, NULL, "CLONE_NEWNS (%d) not supported", +CLONE_NEWNS); + +- pid = do_clone_unshare_test(T_UNSHARE, CLONE_NEWNET | CLONE_NEWNS, NULL, +- NULL); ++ pid = do_clone_unshare_test(T_UNSHARE, CLONE_NEWNET | CLONE_NEWNS, ++ dummy, NULL); + if (pid == -1) + tst_brkm(TCONF | TERRNO, NULL, + "unshare syscall smoke test failed"); +-- +2.7.4 + diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-extended/ltp/ltp_20160126.bb index 7ee84e3..841302b 100644 --- a/meta/recipes-extended/ltp/ltp_20160126.bb +++ b/meta/recipes-extended/ltp/ltp_20160126.bb @@ -62,7 +62,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \ file://0034-periodic_output.patch \ file://0035-fix-test_proc_kill-hang.patch \ - file://0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ + file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ + file://0037-containers-netns_netlink-Avoid-segmentation-fault.patch \ " S = "${WORKDIR}/git" -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] ltp/posix: replace CWD with PWD
From: Jackie Huang Backport a patch to replace CWD with PWD to avoid error messages in test results: basename: missing operand Try 'basename --help' for more information. Signed-off-by: Jackie Huang --- ...ix-option-group-test-replace-CWD-qith-PWD.patch | 44 ++ meta/recipes-extended/ltp/ltp_20160126.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch diff --git a/meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch b/meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch new file mode 100644 index 000..8034152 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch @@ -0,0 +1,44 @@ +From f356775c400f40e3803d80a7bd295b4265959c45 Mon Sep 17 00:00:00 2001 +From: Vineet Gupta +Date: Mon, 29 Feb 2016 14:34:40 +0530 +Subject: [PATCH] run-posix-option-group-test: replace CWD qith PWD + +When running LTP Open Posix Testsuite there is lot of messages as: + +| Usage: basename FILE [SUFFIX] +| +| Strip directory path and .SUFFIX from FILE +| +| *** +| Testing +| *** + +This is because there is no $CWD defined in shell and it looks like $PWD +was intended instead. + +Signed-off-by: Vineet Gupta +Signed-off-by: Cyril Hrubis + +Upstream-Status: Backport + +Signed-off-by: Jackie Huang +--- + testcases/open_posix_testsuite/bin/run-tests.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testcases/open_posix_testsuite/bin/run-tests.sh b/testcases/open_posix_testsuite/bin/run-tests.sh +index d4bd988..5ee5687 100755 +--- a/testcases/open_posix_testsuite/bin/run-tests.sh b/testcases/open_posix_testsuite/bin/run-tests.sh +@@ -29,7 +29,7 @@ run_test_loop() { + + cat
[OE-core] [PATCH 0/2] ltp/posix: backport two patches to fix some tests
From: Jackie Huang -- The following changes since commit dae00fbb913c24b6bab00d5b99bd61f3455b4728: sdk-manual: Added note about nullpointer error for launch eclipse (2016-12-08 16:36:40 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_ltp_161212-0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_ltp_161212-0 Jackie Huang (2): ltp: avoid segmentation fault in netns tests ltp/posix: replace CWD with PWD ...twork-nfsv4-acl-acl1.c-Security-fix-on-s.patch} | 0 ...rs-netns_netlink-Avoid-segmentation-fault.patch | 50 ++ ...ix-option-group-test-replace-CWD-qith-PWD.patch | 44 +++ meta/recipes-extended/ltp/ltp_20160126.bb | 4 +- 4 files changed, 97 insertions(+), 1 deletion(-) rename meta/recipes-extended/ltp/ltp/{0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch => 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch} (100%) create mode 100644 meta/recipes-extended/ltp/ltp/0037-containers-netns_netlink-Avoid-segmentation-fault.patch create mode 100644 meta/recipes-extended/ltp/ltp/0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glibc: add -fno-builtin-strlen when not using -O2
From: Jackie Huang The strlen will be inlined when compile with -O, -O1 or -Os, so there is no symbol for strlen in ld-linux-x86-64.so.2, causing a fatal error in valgrind: valgrind: Fatal error at startup: a function redirection valgrind: which is mandatory for this platform-tool combination valgrind: cannot be set up. Details of the redirection are: valgrind: valgrind: A must-be-redirected function valgrind: whose name matches the pattern: strlen valgrind: in an object with soname matching: ld-linux-x86-64.so.2 so add -fno-builtin-strlen when compile with -O, -O1 or -Os. Signed-off-by: Jackie Huang --- meta/recipes-core/glibc/glibc.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index e85c704..7f3e0f6 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -16,8 +16,8 @@ python () { if opt_effective == "-O0": bb.fatal("%s can't be built with %s, try -O1 instead" % (d.getVar('PN', True), opt_effective)) if opt_effective in ("-O", "-O1", "-Os"): -bb.note("%s doesn't build cleanly with %s, adding -Wno-error to SELECTED_OPTIMIZATION" % (d.getVar('PN', True), opt_effective)) -d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error") +bb.note("%s doesn't build cleanly with %s, adding -Wno-error and -fno-builtin-strlen to SELECTED_OPTIMIZATION" % (d.getVar('PN', True), opt_effective)) +d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error -fno-builtin-strlen") } # siteconfig.bbclass runs configure which needs a working compiler -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] gcr: add missing dependencies for vapi
From: Jackie Huang According to the vapi_DEPS definition: gcr-3.vapi depends on gck-1.vapi, gcr-ui-3.vapi depends on gck-1.vapi and gcr-3.vapi But these dependencies are missing for the make targets, so it will fail when build in parallel: error: Package `gck-1' not found in specified Vala API directories or GObject-Introspection GIR directories error: Package `gcr-3' not found in specified Vala API directories or GObject-Introspection GIR directories Signed-off-by: Jackie Huang --- .../gcr-add-missing-dependencies-for-vapi.patch| 51 ++ meta/recipes-gnome/gcr/gcr_3.20.0.bb | 2 + 2 files changed, 53 insertions(+) create mode 100644 meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch diff --git a/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch b/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch new file mode 100644 index 000..a205429 --- /dev/null +++ b/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch @@ -0,0 +1,51 @@ +From e7e0c56ca82031121f192f7f711b78418b154c9f Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Mon, 28 Nov 2016 10:17:34 +0800 +Subject: [PATCH] gcr: add missing dependencies for vapi + +According to the vapi_DEPS definition: +gcr-3.vapi depends on gck-1.vapi, +gcr-ui-3.vapi depends on gck-1.vapi and gcr-3.vapi + +But these dependencies are missing for the make targets, +so it will fail when build in parallel: +error: Package `gck-1' not found in specified Vala API directories or GObject-Introspection GIR directories +error: Package `gcr-3' not found in specified Vala API directories or GObject-Introspection GIR directories + +Upstream-Status: Submitted [https://bug775966.bugzilla-attachments.gnome.org/attachment.cgi?id=341791] + +Signed-off-by: Jackie Huang +--- + gcr/Makefile.am | 2 +- + ui/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcr/Makefile.am b/gcr/Makefile.am +index eda302f..6e78dba 100644 +--- a/gcr/Makefile.am b/gcr/Makefile.am +@@ -221,7 +221,7 @@ gir_DATA += Gcr-@GCR_MAJOR@.gir + + if ENABLE_VAPIGEN + +-gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps ++gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi + + VAPIGEN_VAPIS += gcr-@GCR_MAJOR@.vapi + +diff --git a/ui/Makefile.am b/ui/Makefile.am +index aa52476..6612f0d 100644 +--- a/ui/Makefile.am b/ui/Makefile.am +@@ -160,7 +160,7 @@ gir_DATA += GcrUi-@GCR_MAJOR@.gir + + if ENABLE_VAPIGEN + +-gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps ++gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi gcr-@GCR_MAJOR@.vapi + + VAPIGEN_VAPIS += gcr-ui-@GCR_MAJOR@.vapi + +-- +2.8.3 + diff --git a/meta/recipes-gnome/gcr/gcr_3.20.0.bb b/meta/recipes-gnome/gcr/gcr_3.20.0.bb index b32a455..2088902 100644 --- a/meta/recipes-gnome/gcr/gcr_3.20.0.bb +++ b/meta/recipes-gnome/gcr/gcr_3.20.0.bb @@ -11,6 +11,8 @@ inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstrea # depends on gtk+3, but also x11 through gtk+-x11 REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += "file://gcr-add-missing-dependencies-for-vapi.patch" + SRC_URI[archive.md5sum] = "4314bf89eac293dd0a9d806593ff1b35" SRC_URI[archive.sha256sum] = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379" -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcr: add missing dependencies for vapi
From: Jackie Huang According to the vapi_DEPS definition: gcr-3.vapi depends on gck-1.vapi, gcr-ui-3.vapi depends on gck-1.vapi and gcr-3.vapi But these dependencies are missing for the make targets, so it will fail when build in parallel: error: Package `gck-1' not found in specified Vala API directories or GObject-Introspection GIR directories error: Package `gcr-3' not found in specified Vala API directories or GObject-Introspection GIR directories Signed-off-by: Jackie Huang --- .../gcr-add-missing-dependencies-for-vapi.patch| 51 ++ meta/recipes-gnome/gcr/gcr_3.20.0.bb | 2 + 2 files changed, 53 insertions(+) create mode 100644 meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch diff --git a/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch b/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch new file mode 100644 index 000..4b95103 --- /dev/null +++ b/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch @@ -0,0 +1,51 @@ +From e7e0c56ca82031121f192f7f711b78418b154c9f Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Mon, 28 Nov 2016 10:17:34 +0800 +Subject: [PATCH] gcr: add missing dependencies for vapi + +According to the vapi_DEPS definition: +gcr-3.vapi depends on gck-1.vapi, +gcr-ui-3.vapi depends on gck-1.vapi and gcr-3.vapi + +But these dependencies are missing for the make targets, +so it will fail when build in parallel: +error: Package `gck-1' not found in specified Vala API directories or GObject-Introspection GIR directories +error: Package `gcr-3' not found in specified Vala API directories or GObject-Introspection GIR directories + +Upstream-Status: Submitted [https://github.com/GNOME/gcr/pull/4] + +Signed-off-by: Jackie Huang +--- + gcr/Makefile.am | 2 +- + ui/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcr/Makefile.am b/gcr/Makefile.am +index eda302f..6e78dba 100644 +--- a/gcr/Makefile.am b/gcr/Makefile.am +@@ -221,7 +221,7 @@ gir_DATA += Gcr-@GCR_MAJOR@.gir + + if ENABLE_VAPIGEN + +-gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps ++gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi + + VAPIGEN_VAPIS += gcr-@GCR_MAJOR@.vapi + +diff --git a/ui/Makefile.am b/ui/Makefile.am +index aa52476..6612f0d 100644 +--- a/ui/Makefile.am b/ui/Makefile.am +@@ -160,7 +160,7 @@ gir_DATA += GcrUi-@GCR_MAJOR@.gir + + if ENABLE_VAPIGEN + +-gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps ++gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi gcr-@GCR_MAJOR@.vapi + + VAPIGEN_VAPIS += gcr-ui-@GCR_MAJOR@.vapi + +-- +2.8.3 + diff --git a/meta/recipes-gnome/gcr/gcr_3.20.0.bb b/meta/recipes-gnome/gcr/gcr_3.20.0.bb index b32a455..2088902 100644 --- a/meta/recipes-gnome/gcr/gcr_3.20.0.bb +++ b/meta/recipes-gnome/gcr/gcr_3.20.0.bb @@ -11,6 +11,8 @@ inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstrea # depends on gtk+3, but also x11 through gtk+-x11 REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += "file://gcr-add-missing-dependencies-for-vapi.patch" + SRC_URI[archive.md5sum] = "4314bf89eac293dd0a9d806593ff1b35" SRC_URI[archive.sha256sum] = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379" -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ltp: fix an incorrect macro checking
From: Jackie Huang The previous patch added a check but incorrectly change the elif to if, then it always return 0 for cpuid if the machine is not __i386__ getcpu011 TFAIL : getcpu01.c:140: getcpu() returned wrong value expected cpuid:7, returned value cpuid: 0 After this fix: getcpu011 TPASS : getcpu() returned proper cpuid:7, node id:0 Signed-off-by: Jackie Huang --- .../0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch b/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch index d123074..41f2623 100644 --- a/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +++ b/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch @@ -88,22 +88,19 @@ index c927512..921b107 100644 void cleanup(void); void setup(void); -@@ -164,9 +172,14 @@ static inline int getcpu(unsigned *cpu_id, unsigned *node_id, +@@ -164,7 +172,11 @@ static inline int getcpu(unsigned *cpu_id, unsigned *node_id, { #if defined(__i386__) return syscall(318, cpu_id, node_id, cache_struct); -#elif __GLIBC_PREREQ(2,6) -+#if defined(__GLIBC__) ++#elif defined(__GLIBC__) +#if __GLIBC_PREREQ(2,6) + *cpu_id = sched_getcpu(); +#endif +#else *cpu_id = sched_getcpu(); #endif -+#endif return 0; - } - @@ -191,15 +204,20 @@ unsigned int set_cpu_affinity(void) cpu_set_t *set; size_t size; -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] classes/cpan-base: fix for PERLVERSION
From: Jackie Huang Immediate expansion of get_perl_version() is too early for PERLVERSION, it will result in 'None' before perl is built and packages that rely on this veriable fail to work with the incorrect version. Signed-off-by: Jackie Huang --- meta/classes/cpan-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass index 55ac052..48d53cc 100644 --- a/meta/classes/cpan-base.bbclass +++ b/meta/classes/cpan-base.bbclass @@ -36,5 +36,5 @@ def is_target(d): PERLLIBDIRS = "${libdir}/perl" PERLLIBDIRS_class-native = "${libdir}/perl-native" -PERLVERSION := "${@get_perl_version(d)}" +PERLVERSION = "${@get_perl_version(d)}" PERLVERSION[vardepvalue] = "" -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] packagegroup-core-sdk: Disable sanitizers for mips64el
From: Jackie Huang These are not available on mips64el yet, so disable them. Signed-off-by: Jackie Huang --- meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index aceba78..9c4ea9b 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb @@ -31,6 +31,7 @@ SANITIZERS_aarch64 = "" SANITIZERS_mips = "" SANITIZERS_mipsel = "" SANITIZERS_mips64 = "" +SANITIZERS_mips64el = "" SANITIZERS_mips64n32 = "" SANITIZERS_nios2 = "" SANITIZERS_powerpc64 = "" -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pax : strip off the trailing slash of file name
From: Zhang Xiao When extracting packaes, the trailing slash of the file name has no means but may cause some issue on system call lstat. Remove it. Signed-off-by: Zhang Xiao Signed-off-by: Jackie Huang --- .../pax-strip-off-file-name-s-trailing-slash.patch | 48 ++ meta/recipes-extended/pax/pax_3.4.bb | 4 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/pax/pax/pax-strip-off-file-name-s-trailing-slash.patch diff --git a/meta/recipes-extended/pax/pax/pax-strip-off-file-name-s-trailing-slash.patch b/meta/recipes-extended/pax/pax/pax-strip-off-file-name-s-trailing-slash.patch new file mode 100644 index 000..9e0a335 --- /dev/null +++ b/meta/recipes-extended/pax/pax/pax-strip-off-file-name-s-trailing-slash.patch @@ -0,0 +1,48 @@ +From aa8ba118869b75a2a9cd681b2f0362d9d8f1c7ec Mon Sep 17 00:00:00 2001 +From: Zhang Xiao +Date: Tue, 12 Jul 2016 11:34:45 +0800 +Subject: [PATCH] pax: strip off the trailing slash of file name + +When extracting packaes, the trailing slash of the file name +has no means but may cause some issue on system call lstat. +Remove it. + +Upstream-Status: Pending + +Signed-off-by: Zhang Xiao +--- + src/pat_rep.c | 11 ++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/pat_rep.c b/src/pat_rep.c +index b9a4636..4cbf6bf 100644 +--- a/src/pat_rep.c b/src/pat_rep.c +@@ -605,7 +605,7 @@ int + mod_name(ARCHD *arcn) + { + int res = 0; +- ++ char *pt; + /* +* Strip off leading '/' if appropriate. +* Currently, this option is only set for the tar format. +@@ -639,6 +639,15 @@ mod_name(ARCHD *arcn) + } + + /* ++ * strip off trailing slash. ++ */ ++ pt = &(arcn->name[strlen(arcn->name) - 1]); ++ if (*pt == '/') { ++ *pt = '\0'; ++ arcn->nlen = strlen(arcn->name); ++ } ++ ++ /* +* IMPORTANT: We have a problem. what do we do with symlinks? +* Modifying a hard link name makes sense, as we know the file it +* points at should have been seen already in the archive (and if it +-- +1.8.5.2.233.g932f7e4 + diff --git a/meta/recipes-extended/pax/pax_3.4.bb b/meta/recipes-extended/pax/pax_3.4.bb index 9d1abfb..7ce43ce 100644 --- a/meta/recipes-extended/pax/pax_3.4.bb +++ b/meta/recipes-extended/pax/pax_3.4.bb @@ -16,7 +16,9 @@ DEPENDS_append_libc-musl = " fts " SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.bz2/fbd9023b590b45ac3ade95870702a0d6/${BP}.tar.bz2 \ file://fix_for_compile_with_gcc-4.6.0.patch \ - file://pax-3.4_fix_for_x32.patch" + file://pax-3.4_fix_for_x32.patch \ + file://pax-strip-off-file-name-s-trailing-slash.patch \ +" SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \ file://0001-use-strtoll-instead-of-strtoq.patch \ -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] ppp: fix building with linux-4.8
From: Jackie Huang Fix a build error when using the linux-4.8 headers that results in: In file included from pppoe.h:87:0, from plugin.c:29: ../usr/include/netinet/in.h:211:8: note: originally defined here struct in6_addr ^~~~ In file included from ../usr/include/linux/if_pppol2tp.h:20:0, from ../usr/include/linux/if_pppox.h:26, from plugin.c:52: ../usr/include/linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6' struct sockaddr_in6 { ^~~~ Signed-off-by: Jackie Huang --- .../ppp/ppp/ppp-fix-building-with-linux-4.8.patch | 44 ++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch diff --git a/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch b/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch new file mode 100644 index 000..f77b0de --- /dev/null +++ b/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch @@ -0,0 +1,44 @@ +From 3da19af53e2eee2e77b456cfbb9d633b06656d38 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Thu, 13 Oct 2016 13:41:43 +0800 +Subject: [PATCH] ppp: fix building with linux-4.8 + +Fix a build error when using the linux-4.8 headers that results in: + +In file included from pppoe.h:87:0, + from plugin.c:29: +../usr/include/netinet/in.h:211:8: note: originally defined here + struct in6_addr +^~~~ +In file included from ../usr/include/linux/if_pppol2tp.h:20:0, + from ../usr/include/linux/if_pppox.h:26, + from plugin.c:52: +../usr/include/linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6' + struct sockaddr_in6 { +^~~~ + +Upstream-Status: Submitted [1] + +[1] https://github.com/paulusmack/ppp/pull/69 + +Signed-off-by: Jackie Huang +--- + pppd/plugins/rp-pppoe/pppoe.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h +index 9ab2eee..96d2794 100644 +--- a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h +@@ -84,7 +84,7 @@ typedef unsigned long UINT32_t; + #include + #endif + +-#include ++#include + + #ifdef HAVE_NETINET_IF_ETHER_H + #include +-- +2.8.3 + diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 4437b5c..56dbd98 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -30,6 +30,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \ file://ppp@.service \ file://fix-CVE-2015-3310.patch \ + file://ppp-fix-building-with-linux-4.8.patch \ " SRC_URI_append_libc-musl = "\ -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] Revert "linux-libc-headers: fix in/if.h includes"
From: Jackie Huang This issue is fixed in the ppp recipe. This reverts commit 7c6b78ac8e2b176f77178c3dd12d8455be10845d. --- .../0001-ppp-fix-in-if.h-includes.patch| 83 -- .../linux-libc-headers/linux-libc-headers_4.8.bb | 4 -- 2 files changed, 87 deletions(-) delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch deleted file mode 100644 index f31a539..000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 80f3064c378f8c919aa6450bd7833a154c184f7f Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Mon, 3 Oct 2016 01:18:13 -0400 -Subject: [PATCH] ppp: fix in/if.h includes - -The following kernel commits broke the compilation of ppp, due to redefined -structures. - -Nothing else breaks in userspace with or without these uapi changes, so we -revert them to keep everything building. - - commit 05ee5de7451796cf9a8aeb2f05a57790d4fd2336 - Author: Mikko Rapeli - Date: Mon Aug 22 20:32:42 2016 +0200 - - include/uapi/linux/if_pppol2tp.h: include linux/in.h and linux/in6.h - - Fixes userspace compilation errors like: - - error: field <80><98>addr<80><99> has incomplete type - struct sockaddr_in addr; /* IP address and port to send to */ - ^ - error: field <80><98>addr<80><99> has incomplete type - struct sockaddr_in6 addr; /* IP address and port to send to */ - - Signed-off-by: Mikko Rapeli - Signed-off-by: David S. Miller - - commit eafe92114308acf14e45c6c3d154a5dad5523d1a - Author: Mikko Rapeli - Date: Mon Aug 22 20:32:43 2016 +0200 - - include/uapi/linux/if_pppox.h: include linux/in.h and linux/in6.h - - Fixes userspace compilation errors: - - error: field <80><98>addr<80><99> has incomplete type - struct sockaddr_in addr; /* IP address and port to send to */ - - error: field <80><98>addr<80><99> has incomplete type - struct sockaddr_in6 addr; /* IP address and port to send to */ - - Signed-off-by: Mikko Rapeli - Signed-off-by: David S. Miller - -Signed-off-by: Bruce Ashfield - include/uapi/linux/if_pppol2tp.h | 2 -- - include/uapi/linux/if_pppox.h| 3 --- - 2 files changed, 5 deletions(-) - -diff --git a/include/uapi/linux/if_pppol2tp.h b/include/uapi/linux/if_pppol2tp.h -index 4bd1f55..ca559c6 100644 a/include/uapi/linux/if_pppol2tp.h -+++ b/include/uapi/linux/if_pppol2tp.h -@@ -16,8 +16,6 @@ - #define _UAPI__LINUX_IF_PPPOL2TP_H - - #include --#include --#include - - /* Structure used to connect() the socket to a particular tunnel UDP - * socket over IPv4. -diff --git a/include/uapi/linux/if_pppox.h b/include/uapi/linux/if_pppox.h -index d37bbb1..e128769 100644 a/include/uapi/linux/if_pppox.h -+++ b/include/uapi/linux/if_pppox.h -@@ -21,11 +21,8 @@ - #include - - #include --#include - #include - #include --#include --#include - - /* For user-space programs to pick up these definitions - * which they wouldn't get otherwise without defining __KERNEL__ --- -2.7.4 - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb index 778f0b6..77e0870 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb @@ -8,9 +8,5 @@ SRC_URI_append_libc-musl = "\ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ " -SRC_URI_append = "\ -file://0001-ppp-fix-in-if.h-includes.patch \ -" - SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07" SRC_URI[sha256sum] = "3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a" -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] ppp: fix building with linux-4.8
From: Jackie Huang -- The following changes since commit 371ab635086e2878ada1f00a59c7ec826481ba0a: build-appliance-image: Update to master head revision (2016-10-11 23:43:28 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_ppp-linux-4.8_161008-0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_ppp-linux-4.8_161008-0 Jackie Huang (2): Revert "linux-libc-headers: fix in/if.h includes" ppp: fix building with linux-4.8 .../ppp/ppp/ppp-fix-building-with-linux-4.8.patch | 44 meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + .../0001-ppp-fix-in-if.h-includes.patch| 83 -- .../linux-libc-headers/linux-libc-headers_4.8.bb | 4 -- 4 files changed, 45 insertions(+), 87 deletions(-) create mode 100644 meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-ppp-fix-in-if.h-includes.patch -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] Revert "linux-libc-headers: if_tunnel: remove include of if/ip/in6.h"
From: Jackie Huang The issue is fixed in net-tools. This reverts commit fb71f34d7379569c23cc00e18d134093147613f5. --- ...1-if_tunnel-remove-include-of-if-ip-in6.h.patch | 33 -- .../linux-libc-headers/linux-libc-headers_4.8.bb | 1 - 2 files changed, 34 deletions(-) delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_tunnel-remove-include-of-if-ip-in6.h.patch diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_tunnel-remove-include-of-if-ip-in6.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_tunnel-remove-include-of-if-ip-in6.h.patch deleted file mode 100644 index f201188..000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_tunnel-remove-include-of-if-ip-in6.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 017ae5929312685c4c044765445bfd4d2a4abb5c Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Mon, 3 Oct 2016 12:27:57 -0400 -Subject: [PATCH] if_tunnel: remove include of if/ip/in6.h - -commit 1fe8e0f074c [include/uapi/linux/if_tunnel.h: include linux/if.h, linux/ip.h and linux/in6.h] -breaks the builds of net-tools. - -We remove the new includes until such a time that userspace can adapt to the -new kernel headers. - -Signed-off-by: Bruce Ashfield - include/uapi/linux/if_tunnel.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h -index 777b6cd..1046f55 100644 a/include/uapi/linux/if_tunnel.h -+++ b/include/uapi/linux/if_tunnel.h -@@ -2,9 +2,6 @@ - #define _UAPI_IF_TUNNEL_H_ - - #include --#include --#include --#include - #include - - --- -2.7.4 - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb index ee2d829..778f0b6 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb @@ -10,7 +10,6 @@ SRC_URI_append_libc-musl = "\ SRC_URI_append = "\ file://0001-ppp-fix-in-if.h-includes.patch \ -file://0001-if_tunnel-remove-include-of-if-ip-in6.h.patch \ " SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07" -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] net-tools: fix building with linux-4.8
From: Jackie Huang Fix a build error when using the linux-4.8 headers that results in: In file included from .../sysroots/qemuarm64/usr/include/linux/if_tunnel.h:6:0, from iptunnel.c:39: .../qemuarm64/usr/include/linux/ip.h:85:8: error: redefinition of 'struct iphdr' struct iphdr { ^ In file included from iptunnel.c:29:0: .../qemuarm64/usr/include/netinet/ip.h:44:8: note: originally defined here struct iphdr ^ Signed-off-by: Randy MacLeod Signed-off-by: Jackie Huang --- .../net-tools-fix-building-with-linux-4.8.patch| 52 ++ .../net-tools/net-tools_1.60-26.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch diff --git a/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch b/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch new file mode 100644 index 000..505eeb0 --- /dev/null +++ b/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch @@ -0,0 +1,52 @@ +From 4d56645ea144a34f7cdd3e3ede6452d81fbae251 Mon Sep 17 00:00:00 2001 +From: Randy MacLeod +Date: Sat, 8 Oct 2016 14:42:54 +0800 +Subject: [PATCH] iptunnel.c: include linux/ip.h to fix building with linux-4.8 + +Fix a build error when using the linux-4.8 headers that results in: + +In file included from +.../sysroots/qemuarm64/usr/include/linux/if_tunnel.h:6:0, + from iptunnel.c:39: +.../qemuarm64/usr/include/linux/ip.h:85:8: error: redefinition of +'struct iphdr' + struct iphdr { + ^ +In file included from iptunnel.c:29:0: +.../qemuarm64/usr/include/netinet/ip.h:44:8: note: originally defined here + struct iphdr + ^ + +Upstream-Status: Submitted [1] + +[1] https://sourceforge.net/p/net-tools/mailman/message/35413022/ + +Signed-off-by: Randy MacLeod +Signed-off-by: Jackie Huang +--- + iptunnel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iptunnel.c b/iptunnel.c +index 4943d83..acfcbc7 100644 +--- a/iptunnel.c b/iptunnel.c +@@ -26,7 +26,6 @@ + #include + #include + #include +-#include + #include + #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)) + #include +@@ -36,6 +35,7 @@ + #include + #endif + #include ++#include + #include + + #include "config.h" +-- +2.8.3 + diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb index 9c2adfa..47a68a5 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb @@ -16,6 +16,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20050312T00Z/pool/main/ file://net-tools-1.60-sctp2-quiet.patch \ file://net-tools-1.60-sctp3-addrs.patch \ file://0001-lib-inet6.c-INET6_rresolve-various-fixes.patch \ + file://net-tools-fix-building-with-linux-4.8.patch \ " # for this package we're mostly interested in tracking debian patches, -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] net-tools: fix building with linux-4.8
From: Jackie Huang This is a follow-up from the thread: https://patchwork.openembedded.org/patch/132637/ I reverted Bruce's change and picked Randy's fix for net-tools, build tests are fine for qemux86-64/ppc/arm/arm64/mips and I booted core-image-full-cmdline for qemuarm64 and checked that iptunnel works fine. -- The following changes since commit ac647ea6964e166c395334fe107015030adc1b76: update-rc.d.bbclass: check that init script is executable before running it (2016-10-07 16:53:18 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/d_net-tools-linux-4.8_161008-1 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_net-tools-linux-4.8_161008-1 Jackie Huang (2): Revert "linux-libc-headers: if_tunnel: remove include of if/ip/in6.h" net-tools: fix building with linux-4.8 .../net-tools-fix-building-with-linux-4.8.patch| 52 ++ .../net-tools/net-tools_1.60-26.bb | 1 + ...1-if_tunnel-remove-include-of-if-ip-in6.h.patch | 33 -- .../linux-libc-headers/linux-libc-headers_4.8.bb | 1 - 4 files changed, 53 insertions(+), 34 deletions(-) create mode 100644 meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_tunnel-remove-include-of-if-ip-in6.h.patch -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] boost: add python to default PACKAGECONFIG options
From: Jackie Huang We want to provide python libs by default, and some other popular Linux distributions like redhat/fedora does the same. Signed-off-by: Jackie Huang --- meta/recipes-support/boost/boost.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 7637a4e..f854033 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -34,7 +34,7 @@ BOOST_LIBS_append_x86-64 = " context coroutine" BOOST_LIBS_append_powerpc = " context coroutine" # optional libraries -PACKAGECONFIG ??= "locale" +PACKAGECONFIG ??= "locale python" PACKAGECONFIG[locale] = ",,icu" PACKAGECONFIG[graph_parallel] = ",,,boost-mpi mpich" PACKAGECONFIG[mpi] = ",,mpich" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2 v2] boost: disable pch when build boost-math
From: Jackie Huang It's a work around for a defect when build in parallel: https://svn.boost.org/trac/boost/ticket/12477 Signed-off-by: Jackie Huang --- .../boost/boost-math-disable-pch-for-gcc.patch | 31 ++ meta/recipes-support/boost/boost_1.61.0.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch diff --git a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch new file mode 100644 index 000..595ba17 --- /dev/null +++ b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch @@ -0,0 +1,31 @@ +From cabfcba1ff7511ffd6b91ca244288d44f585aad2 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Fri, 23 Sep 2016 01:04:50 -0700 +Subject: [PATCH] boost-math: disable pch for gcc + +Upstream-Status: Inappropriate [*] + +* It's a work around for a defect when build in parallel: +https://svn.boost.org/trac/boost/ticket/12477 + +Signed-off-by: Jackie Huang +--- + libs/math/build/Jamfile.v2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libs/math/build/Jamfile.v2 b/libs/math/build/Jamfile.v2 +index e19fb2e..82472a7 100644 +--- a/libs/math/build/Jamfile.v2 b/libs/math/build/Jamfile.v2 +@@ -13,7 +13,7 @@ project + #intel-linux:off + intel-darwin:off + msvc-7.1:off +- gcc,windows:off ++ gcc:off + #gcc:-fvisibility=hidden + intel-linux:-fvisibility=hidden + #sun:-xldscope=hidden +-- +2.7.4 + diff --git a/meta/recipes-support/boost/boost_1.61.0.bb b/meta/recipes-support/boost/boost_1.61.0.bb index 33f209c..40e3870 100644 --- a/meta/recipes-support/boost/boost_1.61.0.bb +++ b/meta/recipes-support/boost/boost_1.61.0.bb @@ -9,4 +9,5 @@ SRC_URI += "\ file://0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch \ file://0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch \ file://0004-Use-atomic-by-default-when-BOOST_NO_CXX11_HDR_ATOMIC.patch \ +file://boost-math-disable-pch-for-gcc.patch \ " -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2 v2] boost: add support for additional boost libs
From: Jackie Huang * Added libs: - container - context - coroutine - exception - graph_parallel - locale - math - mpi - wave * Add PACKAGECONFIG to add proper dependencies for: graph_parallel, locale, and mpi. * boost-mpi depends on mpich which is in meta-oe, and boost-graph_parallel depends on boost-mpi, so they are disabled by default, but can be enabled in a distro that needs them. * context and coroutine are added only for x86 and powerpc. Signed-off-by: Jackie Huang --- meta/recipes-support/boost/boost.inc | 33 ++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 5696b6a..7637a4e 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -8,11 +8,14 @@ ARM_INSTRUCTION_SET_armv5 = "arm" BOOST_LIBS = "\ atomic \ chrono \ + container \ date_time \ + exception \ filesystem \ graph \ iostreams \ log \ + math \ program_options \ random \ regex \ @@ -22,12 +25,28 @@ BOOST_LIBS = "\ timer \ test \ thread \ + wave \ " -# optional boost-python library -PACKAGECONFIG ??= "" +# only supported by x86 and powerpc +BOOST_LIBS_append_x86 = " context coroutine" +BOOST_LIBS_append_x86-64 = " context coroutine" +BOOST_LIBS_append_powerpc = " context coroutine" + +# optional libraries +PACKAGECONFIG ??= "locale" +PACKAGECONFIG[locale] = ",,icu" +PACKAGECONFIG[graph_parallel] = ",,,boost-mpi mpich" +PACKAGECONFIG[mpi] = ",,mpich" PACKAGECONFIG[python] = ",,python python3" -BOOST_LIBS += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python python3', '', d)}" + +BOOST_LIBS += "\ +${@bb.utils.contains('PACKAGECONFIG', 'locale', 'locale', '', d)} \ +${@bb.utils.contains('PACKAGECONFIG', 'graph_parallel', 'graph_parallel mpi', \ + bb.utils.contains('PACKAGECONFIG', 'mpi', 'mpi', '', d), d)} \ +${@bb.utils.contains('PACKAGECONFIG', 'python', 'python python3', '', d)} \ +" + inherit python-dir PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" @@ -54,6 +73,10 @@ python __anonymous () { } # Override the contents of specific packages +FILES_${PN}-graph = "${libdir}/libboost_graph.so.*" +FILES_${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" +FILES_${PN}-locale = "${libdir}/libboost_locale.so.*" +FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" FILES_boost-serialization = "${libdir}/libboost_serialization*.so.* \ ${libdir}/libboost_wserialization*.so.*" FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ @@ -159,6 +182,10 @@ do_configure() { echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${WORKDIR}/user-config.jam echo "using python : 3.5 : : ${STAGING_INCDIR}/python3.5m ;" >> ${WORKDIR}/user-config.jam + if ${@bb.utils.contains('BOOST_LIBS', 'mpi', 'true', 'false', d)}; then + echo "using mpi : : mpi ;" >> ${WORKDIR}/user-config.jam + fi + CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT} sed -i '/^using python/d' ${S}/project-config.jam } -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2 v2] boost: add support for additional boost libs
From: Jackie Huang Changes in v2: 1. Add a workaround as a separate commit for the issue found in: http://autobuilder.yocto.io:8010/builders/nightly-x86-64-lsb/builds/56/ 2. Add PACKAGECONFIG for graph_parallel and mpi but disable by default since they depend on mpich which is in meta-oe. 3. Add proper configs in user-config.jam for boost-mpi. Tested with: - default PACKAGECONFIG - all libs in PACKAGECONFIG (need to add meta-oe) Notes: boost-exception will not be created since it's intentional. The following changes since commit 8dfcfbeb14a179a5d5722007d7c986da1dd41b40: arch-mips: Add mips64-o32 tunes (2016-09-24 07:30:10 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/r_add_boost_libs_160926-1 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/r_add_boost_libs_160926-1 Jackie Huang (2): boost: disable pch when build boost-math boost: add support for additional boost libs meta/recipes-support/boost/boost.inc | 33 -- .../boost/boost-math-disable-pch-for-gcc.patch | 31 meta/recipes-support/boost/boost_1.61.0.bb | 1 + 3 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch -- 2.8.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] boost: add support for additional boost libs
From: Jackie Huang * Added libs: - container - context - coroutine - exception - graph_parallel - locale - math - mpi - wave * Add PACKAGECONFIG to add proper dependencies for boost-locale * context and coroutine are added only for x86 and powerpc Signed-off-by: Jackie Huang --- meta/recipes-support/boost/boost.inc | 24 +--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 5696b6a..2386b00 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -8,11 +8,16 @@ ARM_INSTRUCTION_SET_armv5 = "arm" BOOST_LIBS = "\ atomic \ chrono \ + container \ date_time \ + exception \ filesystem \ graph \ + graph_parallel \ iostreams \ log \ + math \ + mpi \ program_options \ random \ regex \ @@ -22,12 +27,24 @@ BOOST_LIBS = "\ timer \ test \ thread \ + wave \ " -# optional boost-python library -PACKAGECONFIG ??= "" +# only supported by x86 and powerpc +BOOST_LIBS_append_x86 = " context coroutine" +BOOST_LIBS_append_x86-64 = " context coroutine" +BOOST_LIBS_append_powerpc = " context coroutine" + +# optional libraries +PACKAGECONFIG ??= "locale" PACKAGECONFIG[python] = ",,python python3" -BOOST_LIBS += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python python3', '', d)}" +PACKAGECONFIG[locale] = ",,icu" + +BOOST_LIBS += "\ +${@bb.utils.contains('PACKAGECONFIG', 'python', 'python python3', '', d)} \ +${@bb.utils.contains('PACKAGECONFIG', 'locale', 'locale', '', d)} \ +" + inherit python-dir PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" @@ -54,6 +71,7 @@ python __anonymous () { } # Override the contents of specific packages +FILES_${PN}-locale = "${libdir}/libboost_locale.so.*" FILES_boost-serialization = "${libdir}/libboost_serialization*.so.* \ ${libdir}/libboost_wserialization*.so.*" FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] boost: Replace math::static_lcm with integer
From: Jackie Huang Replace math with integer according to the commit upstream: --- de05d62aea8e7309026806acf76370e5b1ed9cf3 Replace math::gcd,lcm with integer. --- or it fails with: ./boost/pool/pool.hpp:363:28: error: 'math' has not been declared Signed-off-by: Jackie Huang --- meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch b/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch index 0cd97cc..917617a 100644 --- a/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch +++ b/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch @@ -26,7 +26,7 @@ index c47b11f..417a1e0 100644 +size_type max_chunks() const +{ //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. + size_type partition_size = alloc_size(); -+ size_type POD_size = math::static_lcm::value + sizeof(size_type); ++ size_type POD_size = integer::static_lcm::value + sizeof(size_type); + size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); + + return max_chunks; -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] webkitgtk: disable gobject-introspection on armv7a
From: Jackie Huang Disable gobject-introspection on armv7a to avoid do_compile failure. Signed-off-by: Jackie Huang --- meta/recipes-sato/webkit/webkitgtk_2.12.5.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb index 941d0e2..680ee84 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb @@ -106,3 +106,7 @@ ARM_INSTRUCTION_SET_armv7ve = "thumb" # WebKit2-4.0: ../../libgpg-error-1.21/src/posix-lock.c:119: get_lock_object: Assertion `!"sizeof lock obj"' failed. # qemu: uncaught target signal 6 (Aborted) - core dumped EXTRA_OECMAKE_append_mips64 = " -DENABLE_INTROSPECTION=OFF -DENABLE_GTKDOC=OFF" + +# qemu: uncaught target signal 11 (Segmentation fault) - core dumped +# Segmentation fault +EXTRA_OECMAKE_append_armv7a = " -DENABLE_INTROSPECTION=OFF" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v5] watchdog: enable systemd support
From: Roy Li 1. inherit systemd, and add two unit files which are from Fedora 23 2. auto load soft dog kernel module Signed-off-by: Roy Li Signed-off-by: Robert Yang Signed-off-by: Jackie Huang --- .../watchdog/watchdog/watchdog-ping.service | 11 +++ .../watchdog/watchdog/watchdog.service| 11 +++ meta/recipes-extended/watchdog/watchdog_5.15.bb | 19 +-- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/watchdog/watchdog/watchdog-ping.service create mode 100644 meta/recipes-extended/watchdog/watchdog/watchdog.service diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service b/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service new file mode 100644 index 000..44bac9d --- /dev/null +++ b/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service @@ -0,0 +1,11 @@ +[Unit] +Description=watchdog daemon for use with ping test / network dependency +After=network.target +Conflicts=watchdog.service + +[Service] +Type=forking +ExecStart=@SBINDIR@/watchdog + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog.service b/meta/recipes-extended/watchdog/watchdog/watchdog.service new file mode 100644 index 000..c5faa4e --- /dev/null +++ b/meta/recipes-extended/watchdog/watchdog/watchdog.service @@ -0,0 +1,11 @@ +[Unit] +Description=watchdog daemon +# man systemd.special +# auto added After=basic.target + +[Service] +Type=forking +ExecStart=@SBINDIR@/watchdog + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-extended/watchdog/watchdog_5.15.bb b/meta/recipes-extended/watchdog/watchdog_5.15.bb index cedfc04..826e31f 100644 --- a/meta/recipes-extended/watchdog/watchdog_5.15.bb +++ b/meta/recipes-extended/watchdog/watchdog_5.15.bb @@ -13,6 +13,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ file://watchdog-init.patch \ file://watchdog-conf.patch \ file://wd_keepalive.init \ + file://watchdog-ping.service \ + file://watchdog.service \ " SRC_URI[md5sum] = "678c32f6f35a0492c9c1b76b4aa88828" @@ -22,7 +24,7 @@ UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/watchdog/files/watchdog/"; UPSTREAM_CHECK_REGEX = "/watchdog/(?P(\d+[\.\-_]*)+)/" inherit autotools -inherit update-rc.d +inherit update-rc.d systemd DEPENDS_append_libc-musl = " libtirpc " CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc " @@ -37,16 +39,29 @@ INITSCRIPT_PARAMS_${PN} = "start 15 1 2 3 4 5 . stop 85 0 6 ." INITSCRIPT_NAME_${PN}-keepalive = "wd_keepalive" INITSCRIPT_PARAMS_${PN}-keepalive = "start 15 1 2 3 4 5 . stop 85 0 6 ." +SYSTEMD_SERVICE_${PN} = "watchdog.service" + do_install_append() { - install -D ${S}/redhat/watchdog.init ${D}/${sysconfdir}/init.d/watchdog.sh +install -D ${S}/redhat/watchdog.init ${D}/${sysconfdir}/init.d/watchdog.sh install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive # watchdog.conf is provided by the watchdog-config recipe rm ${D}${sysconfdir}/watchdog.conf + +install -d ${D}${systemd_system_unitdir} +install -m 0644 ${WORKDIR}/watchdog*.service ${D}${systemd_system_unitdir} + +if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then +install -d ${D}${sysconfdir}/modules-load.d +echo "softdog" > ${D}${sysconfdir}/modules-load.d/softdog.conf +sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/*.service +fi } PACKAGES =+ "${PN}-keepalive" +FILES_${PN} += "${systemd_system_unitdir}/*" + FILES_${PN}-keepalive = " \ ${sysconfdir}/init.d/wd_keepalive \ ${sbindir}/wd_keepalive \ -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] default-distrovars.inc: remove libidn from LGPLv2_WHITELIST_GPL-3.0
From: Jackie Huang The libidn recipe is now buildable in distros which blacklist GPL-3.0 without needing to be explicitly whitelisted (since it provides at least one non GPLv3 package). Signed-off-by: Jackie Huang --- meta/conf/distro/include/default-distrovars.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index fac4deb..f7ed943 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -23,7 +23,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}" IMAGE_FEATURES ?= "" WHITELIST_GPL-3.0 ?= "" -LGPLv2_WHITELIST_GPL-3.0 ?= "libidn" +LGPLv2_WHITELIST_GPL-3.0 ?= "" COMMERCIAL_AUDIO_PLUGINS ?= "" # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] meta-ide-support: inherit nopackages
From: Jackie Huang The recipe is to generate an environment script in do_populate_ide_support for using an IDE and it doesn't generate packages at all, so inherit nopackages Signed-off-by: Jackie Huang --- meta/recipes-core/meta/meta-ide-support.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/meta/recipes-core/meta/meta-ide-support.bb index 86c57cd..c4ddcfc 100644 --- a/meta/recipes-core/meta/meta-ide-support.bb +++ b/meta/recipes-core/meta/meta-ide-support.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native" PR = "r3" -inherit meta toolchain-scripts +inherit meta toolchain-scripts nopackages do_populate_ide_support () { toolchain_create_tree_env_script -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] meta-ide-support: set noexec for tasks
From: Jackie Huang The recipe is to generate an environment script in do_populate_ide_support for using an IDE, the tasks listed are not needed, so set 'noexec' for them. Signed-off-by: Jackie Huang --- meta/recipes-core/meta/meta-ide-support.bb | 13 + 1 file changed, 13 insertions(+) diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/meta/recipes-core/meta/meta-ide-support.bb index 86c57cd..ee87a45 100644 --- a/meta/recipes-core/meta/meta-ide-support.bb +++ b/meta/recipes-core/meta/meta-ide-support.bb @@ -9,6 +9,19 @@ PR = "r3" inherit meta toolchain-scripts +do_fetch[noexec] = "1" +do_unpack[noexec] = "1" +do_patch[noexec] = "1" +do_configure[noexec] = "1" +do_compile[noexec] = "1" +do_install[noexec] = "1" +do_package[noexec] = "1" +do_packagedata[noexec] = "1" +do_package_write_ipk[noexec] = "1" +do_package_write_rpm[noexec] = "1" +do_package_write_deb[noexec] = "1" +do_populate_sysroot[noexec] = "1" + do_populate_ide_support () { toolchain_create_tree_env_script } -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 17/17] xhost: control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-graphics/xorg-app/xhost_1.0.7.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb b/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb index 825737f..f23d258 100644 --- a/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb +++ b/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb @@ -15,3 +15,6 @@ PE = "1" SRC_URI[md5sum] = "f5d490738b148cb7f2fe760f40f92516" SRC_URI[sha256sum] = "93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/17] rsync: use rsync.inc to avoid duplicated codes
From: Jackie Huang There are two versions of rsync but the rsync.inc is only used by 3.x, there are duplicated codes in 2.x, so this commit include changes: * remove duplicated codes in 2.x and require the inc * move the LICENSE from inc to each bb Signed-off-by: Jackie Huang --- meta/recipes-devtools/rsync/rsync.inc | 5 - meta/recipes-devtools/rsync/rsync_2.6.9.bb | 23 --- meta/recipes-devtools/rsync/rsync_3.1.2.bb | 4 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/meta/recipes-devtools/rsync/rsync.inc b/meta/recipes-devtools/rsync/rsync.inc index c65f270..8739c9c 100644 --- a/meta/recipes-devtools/rsync/rsync.inc +++ b/meta/recipes-devtools/rsync/rsync.inc @@ -3,11 +3,6 @@ HOMEPAGE = "http://rsync.samba.org/"; BUGTRACKER = "http://rsync.samba.org/bugzilla.html"; SECTION = "console/network" -# GPLv2+ (<< 3.0.0), GPLv3+ (>= 3.0.0) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -# needs to add acl and attr DEPENDS = "popt" SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \ diff --git a/meta/recipes-devtools/rsync/rsync_2.6.9.bb b/meta/recipes-devtools/rsync/rsync_2.6.9.bb index 6854c77..5a19e21 100644 --- a/meta/recipes-devtools/rsync/rsync_2.6.9.bb +++ b/meta/recipes-devtools/rsync/rsync_2.6.9.bb @@ -1,27 +1,12 @@ -SUMMARY = "File synchronization tool" -HOMEPAGE = "http://rsync.samba.org/"; -BUGTRACKER = "http://rsync.samba.org/bugzilla.html"; -SECTION = "console/network" +require rsync.inc -# needs to add acl and attr -DEPENDS = "popt" - -SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \ - file://rsync-2.6.9-fname-obo.patch \ - file://rsyncd.conf" +SRC_URI += "file://rsync-2.6.9-fname-obo.patch \ +file://rsyncd.conf \ +" SRC_URI[md5sum] = "996d8d8831dbca17910094e56dcb5942" SRC_URI[sha256sum] = "ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9" -inherit autotools - -do_install_append() { - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/rsyncd.conf ${D}${sysconfdir} -} - -EXTRA_OEMAKE='STRIP=""' - LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c" diff --git a/meta/recipes-devtools/rsync/rsync_3.1.2.bb b/meta/recipes-devtools/rsync/rsync_3.1.2.bb index 9637ed4..798fecc 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.2.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.2.bb @@ -5,6 +5,10 @@ SRC_URI += "file://makefile-no-rebuild.patch" SRC_URI[md5sum] = "0f758d7e000c0f7f7d3792610fad70cb" SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2" +# GPLv2+ (<< 3.0.0), GPLv3+ (>= 3.0.0) +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + PACKAGECONFIG ??= "acl attr" PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl," PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr," -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/17] rsync: control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-devtools/rsync/rsync.inc | 2 ++ meta/recipes-devtools/rsync/rsync_2.6.9.bb | 2 ++ meta/recipes-devtools/rsync/rsync_3.1.2.bb | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/rsync/rsync.inc b/meta/recipes-devtools/rsync/rsync.inc index 8739c9c..37897ab 100644 --- a/meta/recipes-devtools/rsync/rsync.inc +++ b/meta/recipes-devtools/rsync/rsync.inc @@ -16,3 +16,5 @@ do_install_append() { } EXTRA_OEMAKE='STRIP=""' + +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta/recipes-devtools/rsync/rsync_2.6.9.bb b/meta/recipes-devtools/rsync/rsync_2.6.9.bb index 5a19e21..efdf255 100644 --- a/meta/recipes-devtools/rsync/rsync_2.6.9.bb +++ b/meta/recipes-devtools/rsync/rsync_2.6.9.bb @@ -11,3 +11,5 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c" PR = "r4" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" diff --git a/meta/recipes-devtools/rsync/rsync_3.1.2.bb b/meta/recipes-devtools/rsync/rsync_3.1.2.bb index 798fecc..c6cb331 100644 --- a/meta/recipes-devtools/rsync/rsync_3.1.2.bb +++ b/meta/recipes-devtools/rsync/rsync_3.1.2.bb @@ -9,7 +9,9 @@ SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09 LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -PACKAGECONFIG ??= "acl attr" +PACKAGECONFIG ??= "acl attr \ +${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl," PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr," -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/17] xauth: control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-graphics/xorg-app/xauth_1.0.9.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb b/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb index b173f4f..59b3323 100644 --- a/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb +++ b/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb @@ -10,3 +10,6 @@ PE = "1" SRC_URI[md5sum] = "7d6003f32838d5b688e2c8a131083271" SRC_URI[sha256sum] = "56ce1523eb48b1f8a4f4244fe1c3d8e6af1a3b7d4b0e6063582421b0b68dc28f" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/17] pulseaudio: control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 299982b..6ed79ef 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -42,6 +42,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ dbus \ " @@ -59,6 +60,7 @@ PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[autospawn-for-root] = ",,," PACKAGECONFIG[lirc] = "--enable-lirc,--disable-lirc,lirc" PACKAGECONFIG[webrtc] = "--enable-webrtc-aec,--disable-webrtc-aec,webrtc-audio-processing" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," EXTRA_OECONF_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}" EXTRA_OECONF_append_armeb = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/17] psmisc: control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-extended/psmisc/psmisc.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc index 68e0656..98a8470 100644 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ b/meta/recipes-extended/psmisc/psmisc.inc @@ -15,6 +15,9 @@ S = "${WORKDIR}/psmisc-${PV}" inherit autotools gettext +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + ALLOW_EMPTY_${PN} = "1" PACKAGES =+ "fuser fuser-doc killall killall-doc pstree pstree-doc" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/17] wget: control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES instead of unconditionally enabled. Signed-off-by: Jackie Huang --- meta/recipes-extended/wget/wget.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc index dc381a6..c4abfe4 100644 --- a/meta/recipes-extended/wget/wget.inc +++ b/meta/recipes-extended/wget/wget.inc @@ -9,7 +9,7 @@ INC_PR = "r16" inherit autotools gettext texinfo update-alternatives pkgconfig -EXTRA_OECONF = "--enable-ipv6 --with-ssl=gnutls --disable-rpath --disable-iri \ +EXTRA_OECONF = "--with-ssl=gnutls --disable-rpath --disable-iri \ --without-libgnutls-prefix ac_cv_header_uuid_uuid_h=no" ALTERNATIVE_${PN} = "wget" @@ -20,8 +20,9 @@ RRECOMMENDS_${PN} += "ca-certificates" BBCLASSEXTEND += "nativesdk" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" PACKAGECONFIG[libuuid] = "--with-libuuid, --without-libuuid,util-linux" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # Let aclocal use the relative path for the m4 file rather than # absolute, otherwise there might be an "Argument list too long" error -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/17] lighttpd: control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb index 378accb..5d1ac58 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.39.bb @@ -26,8 +26,11 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t SRC_URI[md5sum] = "63c7563be1c7a7a9819a51f07f1af8b2" SRC_URI[sha256sum] = "7eb9a1853c3d6dd5851682b0733a729ba4158d6bdff80974d5ef5f1f6887365b" -PACKAGECONFIG ??= "openssl" +PACKAGECONFIG ??= "openssl \ +${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," EXTRA_OECONF = " \ --without-bzip2 \ -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/17] libxmu: control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb index 003baec..d5935ff 100644 --- a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb @@ -30,3 +30,6 @@ BBCLASSEXTEND = "native" SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4" SRC_URI[sha256sum] = "756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/17] nspr: control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-support/nspr/nspr_4.12.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-support/nspr/nspr_4.12.bb b/meta/recipes-support/nspr/nspr_4.12.bb index 168341b..fa6d523 100644 --- a/meta/recipes-support/nspr/nspr_4.12.bb +++ b/meta/recipes-support/nspr/nspr_4.12.bb @@ -147,6 +147,9 @@ TESTS = " \ inherit autotools +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + do_compile_prepend() { oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export } -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/17] libxml2: control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-core/libxml/libxml2_2.9.4.bb | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb b/meta/recipes-core/libxml/libxml2_2.9.4.bb index e2febf0..265d2b7 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.4.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb @@ -38,8 +38,11 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us glibc-gconv-ibm export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" -PACKAGECONFIG ??= "python" +PACKAGECONFIG ??= "python \ +${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # WARNING: zlib is require for RPM use EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/17] nfs-utils: control ipv6 support based on DISTRO_FEATURES
From: Jackie Huang Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. Signed-off-by: Jackie Huang --- meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb index 285bd2c..8540503 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb @@ -64,10 +64,13 @@ EXTRA_OECONF = "--with-statduser=rpcuser \ --with-statdpath=/var/lib/nfs/statd \ " -PACKAGECONFIG ??= "tcp-wrappers" +PACKAGECONFIG ??= "tcp-wrappers \ +${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG_remove_libc-musl = "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers" PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," INHIBIT_AUTO_STAGE = "1" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core